X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Fnash%2Fmkinitrd;h=3c50c74f38e53255f9fcf0b4743de626ba8d0735;hp=cbd99feb917a1300e6129b356e9eeb6a74db5602;hb=ad9d4caf99c5f34895882da0343b8c441a237a02;hpb=330345c2824b2e0d7e63cfe952af3e4a6cc2cd3b diff --git a/src/nash/mkinitrd b/src/nash/mkinitrd index cbd99feb91..3c50c74f38 100644 --- a/src/nash/mkinitrd +++ b/src/nash/mkinitrd @@ -314,15 +314,15 @@ fi kernelmajor=`echo $kernel | cut -d . -f 1,2` -#if [ "$kernelmajor" == "2.4" ]; then +if [ "$kernelmajor" == "2.4" ]; then if [ -n "$verbose" ]; then echo "Creating old-style initrd"; fi USE_UDEV= -#else -# if [ -n "$verbose" ]; then echo "Creating initramfs"; fi -# modulefile=/etc/modprobe.conf -# initramfs=1 -# pivot="" -#fi +else + if [ -n "$verbose" ]; then echo "Creating initramfs"; fi + modulefile=/etc/modprobe.conf + initramfs=1 + pivot="" +fi # if we're not using udev, don't set any of the other bits [ -z "$USE_UDEV" ] && UDEV_TMPFS= && UDEV_KEEP_DEV= @@ -588,9 +588,6 @@ ln -s bin $MNTIMAGE/sbin inst /sbin/nash "$MNTIMAGE/bin/nash" inst /sbin/insmod.static "$MNTIMAGE/bin/insmod" -inst /bin/tar.static "$MNTIMAGE/bin/tar" -inst /usr/bin/lzmadec "$MNTIMAGE/bin/lzmadec" -inst /sbin/fsck.minix.static "$MNTIMAGE/bin/fsck.minix" ln -s /sbin/nash $MNTIMAGE/sbin/modprobe if [ -n "$USE_UDEV" ]; then