diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-15 16:33:19 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-06-15 16:33:19 +0000 |
commit | f03764781c3d701e1867ae6a7051e8411fc4678a (patch) | |
tree | 2be8d4e4d2db0143763dea822c2578edec6c6f90 | |
parent | 56d10513e72efcb0976988b18bca29b57ba162ad (diff) | |
download | drakx-backup-do-not-use-f03764781c3d701e1867ae6a7051e8411fc4678a.tar drakx-backup-do-not-use-f03764781c3d701e1867ae6a7051e8411fc4678a.tar.gz drakx-backup-do-not-use-f03764781c3d701e1867ae6a7051e8411fc4678a.tar.bz2 drakx-backup-do-not-use-f03764781c3d701e1867ae6a7051e8411fc4678a.tar.xz drakx-backup-do-not-use-f03764781c3d701e1867ae6a7051e8411fc4678a.zip |
globetrotter support
-rwxr-xr-x | perl-install/standalone/service_harddrake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 91037deba..47e0bcd98 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -31,6 +31,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/; @@ -52,7 +54,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}; @@ -96,8 +98,13 @@ foreach my $hw_class (@harddrake::data::tree) { } elsif ($Ident eq "AGP") { # add agpgart modules to modprobe.preload if needed: modules::write_conf(); + } elsif ($Ident eq "VIDEO") { + require harddrake::autoconf; + harddrake::autoconf::xconf(); + 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}) { |