From 848953efdfd9623fbc65a4cd11ab51ea46c3cdc0 Mon Sep 17 00:00:00 2001 From: cshore Date: Thu, 23 Sep 2010 13:58:05 +0000 Subject: [package] base/block-extroot, base/block-mount: Modified preinit and block-extroot and block-mount so that use of block-mount and block-extroot do not require that block-extroot, block-mount, nor the kernel modules they depend, on are required to included in the image. That is block-extroot and dependencies may now be installed as modules onto the jffs2 part of a squashfs system and it will work. In addition packages which are installed into the jffs2 of a squashfs system may now affect preinit, so long as they do not require execution of commands that occur before the merging of the jffs2 and built-in (squashfs) preinit scripts is done. Thanks jow for the preinit merge stuff! git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23110 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/block-mount/files/fsck.sh | 2 +- package/block-mount/files/mount.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'package/block-mount/files') diff --git a/package/block-mount/files/fsck.sh b/package/block-mount/files/fsck.sh index 2b6402563..3011160a4 100644 --- a/package/block-mount/files/fsck.sh +++ b/package/block-mount/files/fsck.sh @@ -30,5 +30,5 @@ libmount_fsck() { libmount_known_fsck="" -include /lib/functions/fsck +pi_include /lib/functions/fsck diff --git a/package/block-mount/files/mount.sh b/package/block-mount/files/mount.sh index db0fbad1a..583e1a5ca 100644 --- a/package/block-mount/files/mount.sh +++ b/package/block-mount/files/mount.sh @@ -5,8 +5,8 @@ # -. /lib/functions/block.sh -. /lib/functions/fsck.sh +pi_include /lib/functions/block.sh +pi_include /lib/functions/fsck.sh config_mount_by_section() { local cfg="$1" -- cgit v1.2.3