diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-10-29 17:13:59 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-10-29 17:13:59 +0000 |
| commit | f4084dfbc10924c4c963fe4e9244017ddaab0adc (patch) | |
| tree | c756f30a81adb76c0ab208ab0cd2728502d64eaa | |
| parent | 69a66642247ee2f5c63233b2a62a3e392bfa6b3a (diff) | |
| download | drakx-backup-do-not-use-f4084dfbc10924c4c963fe4e9244017ddaab0adc.tar drakx-backup-do-not-use-f4084dfbc10924c4c963fe4e9244017ddaab0adc.tar.gz drakx-backup-do-not-use-f4084dfbc10924c4c963fe4e9244017ddaab0adc.tar.bz2 drakx-backup-do-not-use-f4084dfbc10924c4c963fe4e9244017ddaab0adc.tar.xz drakx-backup-do-not-use-f4084dfbc10924c4c963fe4e9244017ddaab0adc.zip | |
split out reason (needed for next commit)
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index b8720e1f6..31d46e6bd 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -135,7 +135,8 @@ foreach my $device (@devices) { next if $previous_xorg_config{XORG_DRV} eq $new_key; if (!member($current_driver, $card_data->{Driver}, $card_data->{Driver2}, 'fbdev', 'vesa')) { - switch_x_driver($current_driver, $card_data->{Driver}, 'no more supported by this driver'); + my $reason = 'no more supported by this driver'; + switch_x_driver($current_driver, $card_data->{Driver}, $reason); schedule_warn_about_switch() if any { $current_driver =~ $_->{xorg_driver_regexp} } @cards; next; } @@ -162,8 +163,8 @@ foreach my $card (@cards) { my $driver = $cards[0]{Driver}; my $old_driver = cat_('/etc/X11/xorg.conf') =~ /Driver "($card->{xorg_driver_regexp})"/ && $1; if ($old_driver) { - switch_x_driver($card->{xorg_driver_regexp}, $driver, - 'proprietary driver not found for current driver'); + my $reason = 'proprietary driver not found for current driver'; + switch_x_driver($card->{xorg_driver_regexp}, $driver, $reason); schedule_warn_about_switch(); } } |