summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-10-02 11:28:00 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-10-02 11:28:00 +0000
commit22a124d4a7b1de0b0e4b8ceeb0424c6326758790 (patch)
tree39f2d1a3ad248ab76c4b0db94083f5d243fa1b52
parent9ec28cc8db32b62958d812f6b2893b9684a589f1 (diff)
downloaddrakx-22a124d4a7b1de0b0e4b8ceeb0424c6326758790.tar
drakx-22a124d4a7b1de0b0e4b8ceeb0424c6326758790.tar.gz
drakx-22a124d4a7b1de0b0e4b8ceeb0424c6326758790.tar.bz2
drakx-22a124d4a7b1de0b0e4b8ceeb0424c6326758790.tar.xz
drakx-22a124d4a7b1de0b0e4b8ceeb0424c6326758790.zip
try to fix my fix for blank
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/modules.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 90ac0894a..e07d81c43 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -406,7 +406,7 @@ sub main {
fdisk => sub { $o->{partitioning}{fdisk} = 1 },
g_auto_install => sub { $::testing = $::g_auto_install = 1; $o->{partitioning}{auto_allocate} = 1 },
nomouseprobe => sub { $o->{nomouseprobe} = $v },
- blank => sub { $o->{blank} = 1},
+ blank => sub { $o->{blank} = $::blank = 1},
updatemodules => sub { $o->{updatemodules} = 1},
}}{lc $n}; &$f if $f;
} %cmdline;
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 4470475dc..5e61f3847 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -47,7 +47,7 @@ sub load {
};
my @network_devices = $network_module ? detect_devices::getNet() : ();
- if ($::testing || $o->{blank}) {
+ if ($::testing || $::blank) {
log::l("i would load module $_ (@{$options{$_}})") foreach @l;
} elsif ($::isStandalone || $::live) {
run_program::run('/sbin/modprobe', $_, @{$options{$_}})