r3106 - trunk/utils/initrd-tools

[Sven Luther]

Author: luther
Date: 2005-05-14 08:01:59 +0000 (Sat, 14 May 2005)
New Revision: 3106

Modified:
   trunk/utils/initrd-tools/init
   trunk/utils/initrd-tools/mkinitrd
Log:
And also load the modules. Tested on ibook.


Modified: trunk/utils/initrd-tools/init
===================================================================
--- trunk/utils/initrd-tools/init	2005-05-14 06:37:50 UTC (rev 3105)
+++ trunk/utils/initrd-tools/init	2005-05-14 08:01:59 UTC (rev 3106)
@@ -374,6 +374,10 @@
 	modprobe -k $IDE_CORE options="$ide_options"
 fi
 call /loadmodules
+case `uname -m` in
+	ppc) call /loadmodules.powerpc;
+	;;
+esac
 
 if [ $DELAY -gt 0 ]; then
 	echo "Waiting for $DELAY seconds, press ENTER to obtain a shell."

Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2005-05-14 06:37:50 UTC (rev 3105)
+++ trunk/utils/initrd-tools/mkinitrd	2005-05-14 08:01:59 UTC (rev 3106)
@@ -1204,7 +1204,7 @@
 			$insmod $shell \
 			/bin/mount /bin/umount \
 			/sbin/pivot_root /bin/cat /bin/mknod \
-			/usr/sbin/chroot \
+			/usr/sbin/chroot /bin/uname /bin/grep \
 			`command -v stat` $readlink \
 			`cat "$@" exe`
 		do
@@ -1253,6 +1253,23 @@
 		awk '{ $1 = "modprobe -k "; print }' > initrd/loadmodules
 	mv script initrd
 
+	# 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 "modprobe -k ohci-hcd" >>initrd/loadmodules.powerpc
+			echo "modprobe -k uhci-hcd" >>initrd/loadmodules.powerpc
+			echo "modprobe -k usbhid" >>initrd/loadmodules.powerpc
+		;;
+	esac
+
 	cd initrd
 	mkdir -p dev2 devfs etc keyscripts mnt proc scripts sys tmp var