summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xperl-install/standalone/service_harddrake20
1 files changed, 9 insertions, 11 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 8c6464a1a..ee5997fc9 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -24,6 +24,15 @@ my $last_boot_config = "$hw_sysconfdir/previous_hw";
$last_boot_config .= '_X11' if $invert_do_it;
+# first run ? if not read old hw config
+my $previous_config;
+if (-f $last_boot_config && -s $last_boot_config) {
+ eval { $previous_config = Storable::retrieve($last_boot_config) };
+ log::explanations("resetting previous hardware file ($@)") if $@;
+}
+$previous_config ||= {};
+$previous_config = $$previous_config if ref($previous_config) !~ /HASH/;
+
my $modules_conf = modules::any_conf->read;
my $isLaptop = detect_devices::isLaptop();
@@ -83,17 +92,6 @@ foreach my $card (@cards) {
my $is_globetrotter = -f '/usr/sbin/mdkmove';
-# first run ? if not read old hw config
-my $previous_config;
-
-if (-f $last_boot_config && -s $last_boot_config) {
- eval { $previous_config = Storable::retrieve($last_boot_config) };
- log::explanations("resetting previous hardware file ($@)") if $@;
-}
-
-$previous_config ||= {};
-
-$previous_config = $$previous_config if ref($previous_config) !~ /HASH/;
my (%config, $wait);
my $in;
my $splash = -f '/proc/splash';