summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-08-25 10:01:12 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-08-25 10:01:12 +0000
commite509e8dd821cec47a5d9dd7c139a48667188c4ca (patch)
treecbf94c6c3e72034e281797ccf1dd01eeb9ad0534 /perl-install/standalone
parent09e3e8957a6ccfbee736c00bb58325e7f8cff3ec (diff)
downloaddrakx-e509e8dd821cec47a5d9dd7c139a48667188c4ca.tar
drakx-e509e8dd821cec47a5d9dd7c139a48667188c4ca.tar.gz
drakx-e509e8dd821cec47a5d9dd7c139a48667188c4ca.tar.bz2
drakx-e509e8dd821cec47a5d9dd7c139a48667188c4ca.tar.xz
drakx-e509e8dd821cec47a5d9dd7c139a48667188c4ca.zip
just go on if --force is passed
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/service_harddrake5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 2646b2cf8..3cb61933d 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -14,6 +14,9 @@ use harddrake::sound;
use modules;
use Storable qw(store retrieve);
+
+my $force = any { $_ eq '--force' } @ARGV;
+
my $invert_do_it = $ARGV[0] eq 'X11' ? 1 : 0;
my ($hw_sysconfdir, $timeout) = ("/etc/sysconfig/harddrake2", $invert_do_it ? 600 : 25);
my $last_boot_config = "$hw_sysconfdir/previous_hw";
@@ -73,7 +76,7 @@ foreach my $hw_class (@harddrake::data::tree) {
$id => $i;
} eval { &$detector };
$config{$Ident} = \%ID;
- next if !$is_globetrotter && is_empty_hash_ref $previous_config; # don't fsck on first run
+ next if !$is_globetrotter && !$force && is_empty_hash_ref($previous_config); # don't fsck on first run but if --force
my $oldconfig = $previous_config->{$Ident};