From 22a124d4a7b1de0b0e4b8ceeb0424c6326758790 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Wed, 2 Oct 2002 11:28:00 +0000
Subject: try to fix my fix for blank

---
 perl-install/install2.pm | 2 +-
 perl-install/modules.pm  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install')

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{$_}}) 
-- 
cgit v1.2.1