From 18b473ca9b3a1d050285af6c5d1640fafc5e0ecd Mon Sep 17 00:00:00 2001
From: Daniel Dickinson <crazycshore@gmail.com>
Date: Thu, 23 Sep 2010 13:58:05 +0000
Subject: 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!
SVN-Revision: 23110
---
package/block-extroot/files/50_determine_usb_root | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'package/block-extroot/files/50_determine_usb_root')
diff --git a/package/block-extroot/files/50_determine_usb_root b/package/block-extroot/files/50_determine_usb_root
index 98ec001..b899203 100644
--- a/package/block-extroot/files/50_determine_usb_root
+++ b/package/block-extroot/files/50_determine_usb_root
@@ -5,9 +5,8 @@
determine_external_root() {
- . /etc/functions.sh
- . /lib/functions/extmount.sh
- . /lib/functions/mount.sh
+ pi_include /lib/functions/extmount.sh
+ pi_include /lib/functions/mount.sh
local OLD_UCI_CONFIG_DIR="$UCI_CONFIG_DIR"
set_jffs_mp
--
cgit v1.1