summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-25 23:14:11 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-25 23:14:11 +0000
commit57c9a45c5e54c97a71143cf73da8b9ad7c2e5d34 (patch)
tree9a7492fc08e0ac197485735ae2e4bc7688286413 /perl-install/install2.pm
parent7039b28e9cc76fd602016a10c0927b40fc960b58 (diff)
downloaddrakx-57c9a45c5e54c97a71143cf73da8b9ad7c2e5d34.tar
drakx-57c9a45c5e54c97a71143cf73da8b9ad7c2e5d34.tar.gz
drakx-57c9a45c5e54c97a71143cf73da8b9ad7c2e5d34.tar.bz2
drakx-57c9a45c5e54c97a71143cf73da8b9ad7c2e5d34.tar.xz
drakx-57c9a45c5e54c97a71143cf73da8b9ad7c2e5d34.zip
no_comment
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm14
1 files changed, 9 insertions, 5 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index ca4d18cd3..e8e833133 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -544,9 +544,9 @@ sub main {
text => sub { $o->{interactive} = "newt" },
stdio => sub { $o->{interactive} = "stdio"},
corporate => sub { $::corporate = 1 },
- ks => sub { $::auto_install = 1 },
- kickstart => sub { $::auto_install = 1 },
- auto_install => sub { $::auto_install = 1 },
+ ks => sub { $::auto_install = $v },
+ kickstart => sub { $::auto_install = $v },
+ auto_install => sub { $::auto_install = $v },
simple_themes => sub { $o->{simple_themes} = 1 },
alawindows => sub { $o->{security} = 0; $o->{partitioning}{clearall} = 1; $o->{bootloader}{crushMbr} = 1 },
g_auto_install => sub { $::testing = $::g_auto_install = 1; $o->{partitioning}{auto_allocate} = 1 },
@@ -593,8 +593,12 @@ sub main {
if ($::auto_install) {
require install_steps_auto_install;
- eval { $o = $::o = install_any::loadO($o, "Mandrake/auto_inst.cfg.pl") };
- eval { $o = $::o = install_any::loadO($o, "floppy") } if $@;
+ if ($::auto_install eq 'floppy') {
+ eval { $o = $::o = install_any::loadO($o, "auto_inst.cfg.pl") };
+ eval { $o = $::o = install_any::loadO($o, "floppy") } if $@;
+ } else {
+ eval { $o = $::o = install_any::loadO($o, $::auto_install) };
+ }
if ($@) {
log::l("error using auto_install, continuing");
undef $::auto_install;