summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-12-23 10:40:48 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-12-23 10:40:48 +0000
commit007575a8f1e0776ef2c8f4a16ea8b172ade57a69 (patch)
treef67aa7fdcf85dd59671636828da62c9ab2add1ae
parent7f4aeabd469e59f5fd7572b2b64325d192ca0982 (diff)
downloaddrakx-backup-do-not-use-007575a8f1e0776ef2c8f4a16ea8b172ade57a69.tar
drakx-backup-do-not-use-007575a8f1e0776ef2c8f4a16ea8b172ade57a69.tar.gz
drakx-backup-do-not-use-007575a8f1e0776ef2c8f4a16ea8b172ade57a69.tar.bz2
drakx-backup-do-not-use-007575a8f1e0776ef2c8f4a16ea8b172ade57a69.tar.xz
drakx-backup-do-not-use-007575a8f1e0776ef2c8f4a16ea8b172ade57a69.zip
add the waitkey option for keys that have problems to be detected at boot
-rw-r--r--move/isolinux/help.msgbin1144 -> 1307 bytes
-rw-r--r--move/isolinux/make.pl2
-rw-r--r--move/move.pm1
3 files changed, 3 insertions, 0 deletions
diff --git a/move/isolinux/help.msg b/move/isolinux/help.msg
index 3a6d94175..76dd34d78 100644
--- a/move/isolinux/help.msg
+++ b/move/isolinux/help.msg
Binary files differ
diff --git a/move/isolinux/make.pl b/move/isolinux/make.pl
index b71f98035..fb88c46f6 100644
--- a/move/isolinux/make.pl
+++ b/move/isolinux/make.pl
@@ -13,6 +13,8 @@ If you experience problems, you can try to add on the command line :
o 0fupdatemodules07 to use the special update floppy containing modules updates.
o 0fpatch07 to use a patch from the floppy (file named 09patch.pl07).
o 0fcleankey07 to remove previously saved system config files from the USB key.
+ o 0fwaitkey07 to wait 15 more seconds at boot time while detecting the USB key,
+ that might be useful for some keys for which detection doesn't work nicely
o 0fvirtual_key=09/dev/hda10f,09/key07 to use file 09/key07 on device 09/dev/hda107 as a
virtual key instead of a physical one (must be an existing file containing
a valid filesystem - e.g. a loopback).
diff --git a/move/move.pm b/move/move.pm
index b3378ede1..01823fa98 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -170,6 +170,7 @@ sub init {
eval { modules::load('usb-storage', 'sd_mod') };
handle_virtual_key();
$o->{pcmcia} ||= !$::noauto && c::pcmcia_probe();
+ cat_('/proc/cmdline') =~ /\bwaitkey\b/ and sleep 15;
install_steps::setupSCSI($o);
run_program::run('sysctl', '-w', 'kernel.hotplug=/sbin/hotplug');