r3110 - trunk/utils/initrd-tools

[Sven Luther]

Author: luther
Date: 2005-05-14 10:04:58 +0000 (Sat, 14 May 2005)
New Revision: 3110

Modified:
   trunk/utils/initrd-tools/mkinitrd
Log:
Got rid of the grep dependency, thanks to Kamion for helping me out on this.


Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2005-05-14 09:21:29 UTC (rev 3109)
+++ trunk/utils/initrd-tools/mkinitrd	2005-05-14 10:04:58 UTC (rev 3110)
@@ -1204,7 +1204,7 @@
 			$insmod $shell \
 			/bin/mount /bin/umount \
 			/sbin/pivot_root /bin/cat /bin/mknod \
-			/usr/sbin/chroot /bin/uname /bin/grep \
+			/usr/sbin/chroot /bin/uname \
 			`command -v stat` $readlink \
 			`cat "$@" exe`
 		do
@@ -1256,14 +1256,18 @@
 	# Let's make sure the keyboard input modules are actually loaded on powerpc
 	case `dpkg --print-architecture` in
 		powerpc)
-			echo "mount -nt proc proc proc" >>initrd/loadmodules.powerpc
-			echo 'case `grep ^machine /proc/cpuinfo` in' >>initrd/loadmodules.powerpc
-			echo '	*PReP*|*CHRP*)' >>initrd/loadmodules.powerpc
-			echo "		modprobe -k i8042;" >>initrd/loadmodules.powerpc
-			echo "		modprobe -k atkbd;" >>initrd/loadmodules.powerpc
-			echo "		;;" >>initrd/loadmodules.powerpc
-			echo "esac" >>initrd/loadmodules.powerpc
-			echo "umount -n proc" >>initrd/loadmodules.powerpc
+			echo "while read name colon value; do" >>initrd/loadmodules.powerpc
+			echo "  case \$name in" >>initrd/loadmodules.powerpc
+			echo "    machine)" >>initrd/loadmodules.powerpc
+			echo "      case \$value in" >>initrd/loadmodules.powerpc
+			echo "        *PReP*|*CHRP*)" >>initrd/loadmodules.powerpc
+			echo "          modprobe -k i8042" >>initrd/loadmodules.powerpc
+			echo "          modprobe -k atkbd" >>initrd/loadmodules.powerpc
+			echo "          ;;" >>initrd/loadmodules.powerpc
+			echo "      esac" >>initrd/loadmodules.powerpc
+			echo "      ;;" >>initrd/loadmodules.powerpc
+			echo "  esac" >>initrd/loadmodules.powerpc
+			echo "done < /proc/cpuinfo" >>initrd/loadmodules.powerpc
 			echo "modprobe -k ohci-hcd" >>initrd/loadmodules.powerpc
 			echo "modprobe -k uhci-hcd" >>initrd/loadmodules.powerpc
 			echo "modprobe -k usbhid" >>initrd/loadmodules.powerpc