diff options
| author | Anssi Hannula <anssi@mageia.org> | 2011-12-04 02:24:19 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mageia.org> | 2011-12-04 02:24:19 +0000 |
| commit | af1c3e27b50eb834b9ce499d321cd3e0fd1c39d9 (patch) | |
| tree | 2a2ffe2cd1b99b01577e9d9244faf21ac671ce21 | |
| parent | f75afff2b091e9cf05d4aae5c5b4f0a37ed9490f (diff) | |
| download | drakx-af1c3e27b50eb834b9ce499d321cd3e0fd1c39d9.tar drakx-af1c3e27b50eb834b9ce499d321cd3e0fd1c39d9.tar.gz drakx-af1c3e27b50eb834b9ce499d321cd3e0fd1c39d9.tar.bz2 drakx-af1c3e27b50eb834b9ce499d321cd3e0fd1c39d9.tar.xz drakx-af1c3e27b50eb834b9ce499d321cd3e0fd1c39d9.zip | |
service_harddrake: fix xorg.conf Driver switch regexp
This fixes a driver switch failing to alter xorg.conf when the Driver
line doesn't contain default whitespacing (reported by Barry Jackson).
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 5beb2667f..085f13643 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -3,6 +3,8 @@ switched o show a correct warning message when a proprietary driver is loaded while a free driver is configured + o fix driver switch failing to alter xorg.conf when the Driver line doesn't + contain default whitespacing (reported by Barry Jackson) Version 13.70.2 - 27 November 2011 diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index f29636753..8dbe2a8db 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -133,7 +133,7 @@ sub switch_x_driver { # This should use calls to Xconfig instead of substitution. However, currently # Xconfig probably makes too intrusive changes to xorg.conf when switching the driver. cp_af('/etc/X11/xorg.conf', "/etc/X11/xorg.conf.mga$^T"); - substInFile { s!Driver "($old_driver)"!Driver "$new_driver"!g } '/etc/X11/xorg.conf'; + substInFile { s!^(\s*Driver\s+)"$old_driver"!$1"$new_driver"!i } '/etc/X11/xorg.conf'; log::explanations("switch X.org driver from '$old_driver' to '$new_driver' ($reason)"); Xconfig::card::libgl_config_and_more({ Driver => $new_driver }); Xconfig::various::setup_kms(); |