diff options
| author | Daniel Dickinson <crazycshore@gmail.com> | 2010-09-23 13:58:05 +0000 |
|---|---|---|
| committer | Daniel Dickinson <crazycshore@gmail.com> | 2010-09-23 13:58:05 +0000 |
| commit | 18b473ca9b3a1d050285af6c5d1640fafc5e0ecd (patch) | |
| tree | 3a7e67349a8a9e5ad2cf07ef8aa837b6062fb909 /package/block-mount/files | |
| parent | 19723d09c279f2dad7546ae56a5d081984e3d229 (diff) | |
| download | upstream-18b473ca9b3a1d050285af6c5d1640fafc5e0ecd.tar.gz upstream-18b473ca9b3a1d050285af6c5d1640fafc5e0ecd.tar.bz2 upstream-18b473ca9b3a1d050285af6c5d1640fafc5e0ecd.zip | |
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
Diffstat (limited to 'package/block-mount/files')
| -rw-r--r-- | package/block-mount/files/fsck.sh | 2 | ||||
| -rw-r--r-- | package/block-mount/files/mount.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/block-mount/files/fsck.sh b/package/block-mount/files/fsck.sh index 2b64025635..3011160a44 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 db0fbad1ab..583e1a5cab 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" |