Ignore:
Timestamp:
2010-09-23T15:58:05+02:00 (6 years ago)
Author:
cshore
Message:

[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!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/block-extroot/files/extmount.sh

    r19880 r23110  
    1414 
    1515er_load_modules() { 
    16         [ -d $ER_ROOT/etc/modules.d ] && { 
    17             cd $ER_ROOT/etc/modules.d && { 
    18                 local modules="$(grep -l '# May be required for rootfs' *)" 
    19                 cat $modules | sed 's/^\([^#]\)/insmod \1/' | sh 2>&- || :  
    20             } 
     16        mkdir -p /tmp/extroot_modules/modules.d 
     17        mkdir -p /tmp/extroot_modules/modules 
     18        ln -sf /etc/modules.d/* /tmp/overlay/etc/modules.d/* /tmp/extroot_modules/modules.d 
     19        ln -sf /lib/modules/*/* /tmp/overlay/lib/modules/*/* /tmp/extroot_modules/modules 
     20        local modules="$(grep -l '# May be required for rootfs' /tmp/extroot_modules/modules.d/*)" 
     21        cd /tmp/extroot_modules/modules && { 
     22                cat $modules | sed -e 's/^\([^#].*\)/insmod \.\/\1.ko/'| sh 2>&- || : 
    2123        } 
     24        rm -rf /tmp/extroot_modules 
    2225} 
    2326 
    24  
Note: See TracChangeset for help on using the changeset viewer.