mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[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
This commit is contained in:
@@ -13,12 +13,14 @@ set_jffs_mp() {
|
||||
}
|
||||
|
||||
er_load_modules() {
|
||||
[ -d $ER_ROOT/etc/modules.d ] && {
|
||||
cd $ER_ROOT/etc/modules.d && {
|
||||
local modules="$(grep -l '# May be required for rootfs' *)"
|
||||
cat $modules | sed 's/^\([^#]\)/insmod \1/' | sh 2>&- || :
|
||||
}
|
||||
mkdir -p /tmp/extroot_modules/modules.d
|
||||
mkdir -p /tmp/extroot_modules/modules
|
||||
ln -sf /etc/modules.d/* /tmp/overlay/etc/modules.d/* /tmp/extroot_modules/modules.d
|
||||
ln -sf /lib/modules/*/* /tmp/overlay/lib/modules/*/* /tmp/extroot_modules/modules
|
||||
local modules="$(grep -l '# May be required for rootfs' /tmp/extroot_modules/modules.d/*)"
|
||||
cd /tmp/extroot_modules/modules && {
|
||||
cat $modules | sed -e 's/^\([^#].*\)/insmod \.\/\1.ko/'| sh 2>&- || :
|
||||
}
|
||||
rm -rf /tmp/extroot_modules
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user