summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-07-23 09:04:01 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-07-23 09:04:01 +0000
commit7ec6169f18805dc3b211e9604d7e318f46973ce3 (patch)
tree24d013061aad6c40bb928690685d63b8945e45c6
parent7bf28e1f15fd5da4437cb16dc671550b45f653b2 (diff)
downloaddrakx-7ec6169f18805dc3b211e9604d7e318f46973ce3.tar
drakx-7ec6169f18805dc3b211e9604d7e318f46973ce3.tar.gz
drakx-7ec6169f18805dc3b211e9604d7e318f46973ce3.tar.bz2
drakx-7ec6169f18805dc3b211e9604d7e318f46973ce3.tar.xz
drakx-7ec6169f18805dc3b211e9604d7e318f46973ce3.zip
try to fix isolinux for 9.0
- default target has automatic=method:cdrom so that no question is asked for method and which cdrom drive - explanation about other targets being for more installation options, and provide also default kernel in these targets
-rwxr-xr-xmake_boot_img15
1 files changed, 10 insertions, 5 deletions
diff --git a/make_boot_img b/make_boot_img
index c37f8c1dc..c26939f6f 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -501,17 +501,22 @@ F1 help.msg" : "display help.msg") . "
" . join('', map {
"label $_->[0]
kernel alt0/vmlinuz
- append changedisk initrd=alt0/all.rdz $_->[1]
+ append initrd=alt0/all.rdz $_->[1] automatic=method:cdrom
" } entries_append('all'))
. join('', map_index {
"label alt$::i
kernel alt$::i/vmlinuz
- append changedisk initrd=alt$::i/all.rdz $default_append $default_vga
+ append initrd=alt$::i/all.rdz $default_append $default_vga
" } @kernels);
output "isolinux/help.msg", (-e "isolinux/boot.msg" && pack "C*", 0x0E, 0x03, 0x00) .
-"This is a special bootable CDROM giving you a choice between various kernels.
+"Welcome to Mandrake Linux Installation.
-The default is kernel $main.
-" . join('', map_index { $::i ? "\"alt$::i\" is kernel $_\n" : '' } @kernels);
+If you want more installations options (install from hard
+disk, network, etc), select the kernel you wish to use for
+this installation. Or you may just type Enter, so that the
+automatic CDROM installation will proceed, with the default
+kernel ($main).
+
+" . join('', map_index { "\"alt$::i\" is kernel $_\n" } @kernels);
}