summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2000-12-21 12:32:11 +0000
committerdamien <damien@mandriva.com>2000-12-21 12:32:11 +0000
commit4bb8cb1c4187ce2b46940a4ca814cd98bb433f8a (patch)
treea469862eeac3b1f2ac0cd47b1134317840329335
parent84a4032b9568201a534e6d8b9f0924bdd32f74df (diff)
downloaddrakx-backup-do-not-use-4bb8cb1c4187ce2b46940a4ca814cd98bb433f8a.tar
drakx-backup-do-not-use-4bb8cb1c4187ce2b46940a4ca814cd98bb433f8a.tar.gz
drakx-backup-do-not-use-4bb8cb1c4187ce2b46940a4ca814cd98bb433f8a.tar.bz2
drakx-backup-do-not-use-4bb8cb1c4187ce2b46940a4ca814cd98bb433f8a.tar.xz
drakx-backup-do-not-use-4bb8cb1c4187ce2b46940a4ca814cd98bb433f8a.zip
firewall : automatic class set when firewall (beginner=0)
-rw-r--r--perl-install/install2.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 27555e4fd..008e7295c 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -452,6 +452,7 @@ sub main {
$::isInstall = 1;
$::beginner = $::expert = $::g_auto_install = 0;
+ symlinkf("/tmp/image", "/tmp/rhimage");
#- c::unlimit_core() unless $::testing;
@@ -478,7 +479,7 @@ sub main {
my $f = ${{
oem => sub { $::oem = $v },
lang => sub { $o->{lang} = $v },
- flang => sub { $o->{lang} = $v ; push @auto, 'selectLanguage' },
+ flang => sub { $o->{lang} = $v ; push @auto, 'selectLanguage'; },
method => sub { $o->{method} = $v },
pcmcia => sub { $o->{pcmcia} = $v },
vga16 => sub { $o->{vga16} = $v },
@@ -489,7 +490,7 @@ sub main {
class => sub { $o->{installClass} = $v },
fclass => sub { $o->{installClass} = $v; push @auto, 'selectInstallClass' },
desktop => sub { $o->{meta_class} = 'desktop' },
- firewall => sub { $o->{meta_class} = 'firewall'; push @auto, 'selectInstallClass'},
+ firewall => sub { $o->{meta_class} = 'firewall'; push @auto, 'selectInstallClass'; $::beginner = 0},
lnx4win => sub { $o->{lnx4win} = 1 },
readonly => sub { $o->{partitioning}{readonly} = $v ne "0" },
display => sub { $o->{display} = $v },