summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-05 23:39:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-05 23:39:19 +0000
commitd72f07a5fcb1614f2450a2fd74d07274d21f23ad (patch)
tree451e049ca0c7acca706159731295563b52ae4215
parent01d4f69190a5664a4cee7d24096038621f9b82b1 (diff)
downloaddrakx-backup-do-not-use-d72f07a5fcb1614f2450a2fd74d07274d21f23ad.tar
drakx-backup-do-not-use-d72f07a5fcb1614f2450a2fd74d07274d21f23ad.tar.gz
drakx-backup-do-not-use-d72f07a5fcb1614f2450a2fd74d07274d21f23ad.tar.bz2
drakx-backup-do-not-use-d72f07a5fcb1614f2450a2fd74d07274d21f23ad.tar.xz
drakx-backup-do-not-use-d72f07a5fcb1614f2450a2fd74d07274d21f23ad.zip
(generateAutoInstFloppy): use generate_automatic_stage1_params
-rw-r--r--perl-install/install_steps_interactive.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d08fb0efb..17099cf13 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1055,6 +1055,7 @@ sub generateAutoInstFloppy {
commands::rm("-rf", $workdir, $mountdir, $imagefile);
} else {
+ my $param = 'kickstart=floppy ' . install_any::generate_automatic_stage1_params($o);
{
my $w = $o->wait_message('', _("Creating auto install floppy"));
install_any::getAndSaveFile("images/$image.img", $dev) or log::l("failed to write $dev"), return;
@@ -1062,11 +1063,10 @@ sub generateAutoInstFloppy {
fs::mount($dev, "/floppy", "vfat", 0);
substInFile {
s/timeout.*/$replay ? 'timeout 1' : ''/e;
- s/^(\s*append)/$1 kickstart=floppy/
+ s/^(\s*append)/$1 $param/
} "/floppy/syslinux.cfg";
unlink "/floppy/help.msg";
- output "/floppy/ks.cfg", install_any::generate_ks_cfg($o);
output "/floppy/boot.msg", "\n0c",
"!! If you press enter, an auto-install is going to start.
All data on this computer is going to be lost !!