From: Tim Yamin <plasmaroo@gentoo.org>
Date: Sun, 20 Feb 2005 01:03:45 +0000 (+0000)
Subject: Fix '/tmp/.initrd/bin/[' to '[' in places before the pivot_root.
X-Git-Tag: v3.4.10.902~582
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6c97e9fa52aee0b68b75b25e963fa29497b00229;p=genkernel.git

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 a9d6282..fea8137 100644
--- 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 9d73e09..07ee224 100755
--- 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.