--- /sbin/geninitrd	2008-08-06 13:16:10.000000000 +0200
+++ /sbin/geninitrd_usb	2008-09-14 11:51:20.000000000 +0200
@@ -25,6 +25,7 @@
 USEINSMODSTATIC=no
 USE_SUSPEND=yes
 USE_TUXONICE=no
+WAIT_FOR_KEY=no
 # it should be safe to remove scsi_mod from here, but I'm not sure...
 PRESCSIMODS="-scsi_mod unknown -sd_mod"
 PREIDEMODS="-ide-core unknown -ide-detect -ide-disk"
@@ -102,7 +103,7 @@
 	echo "       [--with-suspend] [--without-suspend]"
 	echo "       [--with-tuxonice] [--without-tuxonice]"
 	echo "       [--without-dmraid] [--without-multipath]"
-	echo "       [--without-blkid]"
+	echo "       [--without-blkid] [--with-wait_key]"
 	echo "       <initrd-image> <kernel-version>"
 	echo ""
 	echo "example:"
@@ -1703,6 +1704,9 @@
 	--without-blkid)
 		USE_BLKID=no
 		;;
+	--with-wait_key)
+		WAIT_FOR_KEY=yes
+		;;
 	--with=*)
 		BASICMODULES="$BASICMODULES ${1#--with=}"
 		;;
@@ -2073,6 +2077,13 @@
 # additional devs always needed
 [ ! -e "$DESTDIR/$rootdev_add" ] && inst $rootdev_add /dev
 
+if is_yes "$WAIT_FOR_KEY"; then
+add_linuxrc <<-'EOF'
+	echo "Press ENTER to start boot ..."
+	read waitforkey
+EOF
+fi
+
 if [ "$INITRDFS" = "initramfs" ]; then
 	inst_d /newroot
 	if [ "$rootdev" = "/dev/nfs" ]; then