[package] base-files: implement "reqopts" parameter for dhcp interfaces to specify...

[openwrt.git] / package / base-files / files / lib / preinit / 41_merge_overlay_hooks

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 df39db1..4ca6877 100644 (file)
--- a/package/base-files/files/lib/preinit/41_merge_overlay_hooks
+++ b/package/base-files/files/lib/preinit/41_merge_overlay_hooks
@@ -6,31 +6,7 @@ merge_overlay_hooks() {
                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
-#!/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/
+               ln -sf /lib/preinit/* /tmp/overlay/lib/preinit/[0-9][0-9]_* /tmp/preinit-hook-merge/
 
                boot_hook_splice_start