X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=rewrite%2Flinuxrc;h=86f67afd90ffee4ee45f325cf10f52ff19e370b3;hb=f74fd8bd93b5b6732c1378ef6ea5de461995ba8f;hp=48b2aa9d0d68db5e9105e588974cec99d2484c28;hpb=c2973166d09f796d31916b37790739730071a8d6;p=grml-live.git diff --git a/rewrite/linuxrc b/rewrite/linuxrc index 48b2aa9..86f67af 100644 --- a/rewrite/linuxrc +++ b/rewrite/linuxrc @@ -531,8 +531,9 @@ if [ -n "$NFS" ]; then done } # modules.alias and modules.dep are in place so USE IT :)! - modLoad "$(for x in $(find /sys/devices/ -name modalias); do grep pci: $x; done |/static/xargs)" - + find /sys/devices/ -name modalias |/static/xargs -r /static/grep -h pci: |while read i; do + modLoad "$i" + done # loading additional modules modLoad sunrpc lockd af_packet nfs @@ -901,15 +902,13 @@ if test -n "$UNIONFS" && /bin/mount -t $UNIONFS_FILETYPE -o noatime${SECURE},dir fi # We now have unionfs, copy some data from the initial ramdisk first cp -a /etc/fstab /etc/auto.mnt /etc/filesystems /etc/mtab /UNIONFS/etc/ - # disable resolvconf on the terminalserver client if [ -n "$NFS" ] ; then rm /UNIONFS/etc/resolv.conf cp -a /etc/resolv.conf /UNIONFS/etc echo REPORT_ABSENT_SYMLINK=no >> /UNIONFS/etc/default/resolvconf fi - - for i in bin boot etc sbin var lib opt root usr; do # Move directories to unionfs + for i in bin boot etc sbin var opt root usr $EMUL $LIB64 lib ; do # Move directories to unionfs if test -d /$i; then /bin/mv /$i /$i.old && \ # /GRML/lib/ld-linux.so.2 --library-path /GRML/lib /GRML/bin/ln -snf /UNIONFS/$i /$i && \