Fix '/tmp/.initrd/bin/[' to '[' in places before the pivot_root.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@170 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/generic/linuxrc b/generic/linuxrc
index a9d62820d759222ba3f1d8f9cdd93c75cb2c8e33..fea8137521c94b414d746e8de9f483de811c2b28 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -427,10 +427,10 @@ then
                mount -t ext2 -o ro /newroot/dev/loop0 /newroot/mnt/livecd
                FS_LOCATION='mnt/livecd'
                umount /dev
-       elif /tmp/.initrd/bin/[ "${LOOPTYPE}" = 'zisofs' ]
+       elif [ "${LOOPTYPE}" = 'zisofs' ]
        then
                FS_LOCATION="mnt/cdrom/${LOOPEXT}${LOOP}"
-       elif /tmp/.initrd/bin/[ "${LOOPTYPE}" = 'noloop' ]
+       elif [ "${LOOPTYPE}" = 'noloop' ]
        then
                FS_LOCATION='mnt/cdrom'
        fi
@@ -447,7 +447,7 @@ else
        mkdir -p /newroot/tmp/.initrd
 fi
 
-/tmp/.initrd/bin/[ ! -e /newroot/dev/console ] && mknod /newroot/dev/console c 5 1
+[ ! -e /newroot/dev/console ] && mknod /newroot/dev/console c 5 1
 echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting"
 
 cd /newroot

diff --git a/genkernel b/genkernel
index 9d73e09e9cb2498cf8bc90f956147a200dbc3d73..07ee22407d474e5f6fccf74e2a6dd98b460eee72 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Genkernel v3
 
-GK_V='3.1.0j'
+GK_V='3.1.0k'
 TEMP='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.