--- trunk/mkinitrd/mkinitrd.sh 2005/12/02 14:48:31 290 +++ trunk/mkinitrd/mkinitrd.sh 2005/12/02 15:35:32 291 @@ -1,5 +1,5 @@ #!/bin/bash -# $Header: /home/cvsd/magellan-cvs/magellan-src/mkinitrd/mkinitrd.sh,v 1.1 2005-12-02 14:48:31 niro Exp $ +# $Header: /home/cvsd/magellan-cvs/magellan-src/mkinitrd/mkinitrd.sh,v 1.2 2005-12-02 15:35:32 niro Exp $ # mkinitrd # @@ -646,10 +646,10 @@ # install busybox install -m0755 $(which busybox.mkinitrd) ${DEST}/bin/busybox || die -for i in '[' ash awk basename cat cut chroot clear cp dirname echo env false find \ - grep gunzip gzip insmod ln ls loadkmap losetup lsmod mkdir mknod modprobe more mount mv \ - pivot_root ps pwd rm rmdir rmmod sh sleep tar test touch true umount uname \ - xargs yes zcat chmod chown +for i in '[' ash basename cat cut chroot clear cp dirname echo env false find \ + grep gunzip gzip ln ls loadkmap losetup mkdir mknod modprobe more mount mv \ + ps pwd rm rmdir sh sleep test touch true umount uname \ + xargs yes chmod chown do # static links ln ${DEST}/bin/busybox ${DEST}/bin/${i} || die "${i}" @@ -658,6 +658,9 @@ # install run-init install -m0755 $(which run-init.mkinitrd) ${DEST}/bin/run-init || die +# install insmod.static +install -m0755 $(which insmod.static) ${DEST}/bin/insmod || die + # install udev cp -a /etc/udev ${DEST}/etc || die install -m0755 /sbin/udev.static ${DEST}/bin/udev || die @@ -735,7 +738,7 @@ add_initrd ' echo "-- Loadin module ${i}"' add_initrd ' insmod ${i};' # handle special cases like usb -add_initrd ' if [[ ${i} = usb-storage ]]' +add_initrd ' if [ "${i}" = "usb-storage" ]' add_initrd ' then' add_initrd ' echo "Waiting 8 seconds for usb-driver initialization."' add_initrd ' sleep 8'