summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-06-18 04:29:24 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-06-18 04:29:24 +0000
commit735a9fc9852608380814958f3c60e5f203aa4d8b (patch)
tree76e7dd2ae8025e295dbc4f1373a6258894dda327
parent0c7ab660185ddcd41bb6d72b34e311b189275a9d (diff)
downloaddrakx-735a9fc9852608380814958f3c60e5f203aa4d8b.tar
drakx-735a9fc9852608380814958f3c60e5f203aa4d8b.tar.gz
drakx-735a9fc9852608380814958f3c60e5f203aa4d8b.tar.bz2
drakx-735a9fc9852608380814958f3c60e5f203aa4d8b.tar.xz
drakx-735a9fc9852608380814958f3c60e5f203aa4d8b.zip
merge globetrotter support from MDK-10-branch
-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 c870be9fe..c50f71a4d 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -39,6 +39,8 @@ if (find { $_->{driver} =~ /Card:NVIDIA/ } detect_devices::probeall()) {
}
}
+my $is_globetrotter = -f '/usr/sbin/mdkmove';
+
# first run ? if not read old hw config
my $previous_config = -f $last_boot_config && -s $last_boot_config ? Storable::retrieve($last_boot_config) : {};
$previous_config = $$previous_config if ref($previous_config) !~ /HASH/;
@@ -60,7 +62,7 @@ foreach my $hw_class (@harddrake::data::tree) {
$id => $i;
} eval { &$detector };
$config{$Ident} = \%ID;
- next if is_empty_hash_ref $previous_config; # don't fsck on first run
+ next if !$is_globetrotter && is_empty_hash_ref $previous_config; # don't fsck on first run
my $oldconfig = $previous_config->{$Ident};
@@ -110,6 +112,7 @@ foreach my $hw_class (@harddrake::data::tree) {
undef @configurator_pool;
}
+ next if $is_globetrotter && $configurator_pool[0] !~ /drakupdate_fstab/;
next unless -x first(split /\s+/, $configurator_pool[0]);
my ($pid, $no, $res);
if (!$hw_class->{automatic}) {