From: cshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 23 Sep 2010 14:06:47 +0000 (+0000)
Subject: [base system & package/block-extroot] Fixed duplicated content in file in commit... 
X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/a1a1bdd22154f4f1773e0e3a39e1165d1f8c17d0

[base system & package/block-extroot] Fixed duplicated content in file in commit 23111


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23112 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/base-files/files/lib/preinit/41_merge_overlay_hooks b/package/base-files/files/lib/preinit/41_merge_overlay_hooks
index df39db15f..d0a3c1810 100644
--- a/package/base-files/files/lib/preinit/41_merge_overlay_hooks
+++ b/package/base-files/files/lib/preinit/41_merge_overlay_hooks
@@ -22,27 +22,3 @@ merge_overlay_hooks() {
 }
 
 boot_hook_add preinit_mount_root merge_overlay_hooks
-#!/bin/sh
-# Copyright (C) 2010 OpenWrt.org
-
-merge_overlay_hooks() {
-	jffs2_not_mounted || [ ! -d /tmp/overlay/lib/preinit ] || {
-		echo "- merge overlay components -"
-
-		mkdir -p /tmp/preinit-hook-merge
-		ln -sf /lib/preinit/* /tmp/overlay/lib/preinit/* /tmp/preinit-hook-merge/
-
-		boot_hook_splice_start
-
-		local pipart
-		for pipart in /tmp/preinit-hook-merge/*; do
-			. $pipart
-		done
-
-		boot_hook_splice_finish
-
-		rm -rf /tmp/preinit-hook-merge
-	}
-}
-
-boot_hook_add preinit_mount_root merge_overlay_hooks