summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-01 16:34:10 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-01 16:34:10 +0000
commit847f17456e468f605905b552e28d4f4500d86620 (patch)
tree578d7d1264f48ccdecb9cabd428982962d8c0222 /perl-install/standalone
parent6dc106922858a67429f64a898c4ac5999b4afaae (diff)
downloaddrakx-847f17456e468f605905b552e28d4f4500d86620.tar
drakx-847f17456e468f605905b552e28d4f4500d86620.tar.gz
drakx-847f17456e468f605905b552e28d4f4500d86620.tar.bz2
drakx-847f17456e468f605905b552e28d4f4500d86620.tar.xz
drakx-847f17456e468f605905b552e28d4f4500d86620.zip
use a variable to store first run info
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/service_harddrake3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index ee5997fc9..a9b8fe8d2 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -32,6 +32,7 @@ if (-f $last_boot_config && -s $last_boot_config) {
}
$previous_config ||= {};
$previous_config = $$previous_config if ref($previous_config) !~ /HASH/;
+my $first_run = is_empty_hash_ref($previous_config);
my $modules_conf = modules::any_conf->read;
@@ -114,7 +115,7 @@ foreach my $hw_class (@harddrake::data::tree) {
$id => $i;
} eval { $detector->({}) };
$config{$Ident} = \%ID;
- next if !$is_globetrotter && !$force && is_empty_hash_ref($previous_config); # do not fsck on first run but if --force
+ next if !$is_globetrotter && !$force && $first_run; # do not fsck on first run but if --force
my $oldconfig = $force ? {} : $previous_config->{$Ident};