diff options
| author | Daniel Dickinson <daniel@cshore.neomailbox.net> | 2010-09-23 13:58:05 +0000 |
|---|---|---|
| committer | Daniel Dickinson <daniel@cshore.neomailbox.net> | 2010-09-23 13:58:05 +0000 |
| commit | ce5a30ba1013ae8b1cecd64148074bcb9ac11841 (patch) | |
| tree | ac8c2aadbe645dd51e97ca474cb1ea5b86257ab6 /package/block-mount | |
| parent | 2a1ba1dec56e54fe9c89ef1c4d8103718101845d (diff) | |
| download | master-187ad058-ce5a30ba1013ae8b1cecd64148074bcb9ac11841.tar.gz master-187ad058-ce5a30ba1013ae8b1cecd64148074bcb9ac11841.tar.bz2 master-187ad058-ce5a30ba1013ae8b1cecd64148074bcb9ac11841.zip | |
[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
Diffstat (limited to 'package/block-mount')
| -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" |