summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-21 16:47:39 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-21 16:47:39 +0000
commit142593316e874567dfaa7164a6a7c36d46ea7f30 (patch)
tree7eba98767658c1309dbaf1654d6bcc412e34b963
parent5b24d850345c1f4e3053ab68827ccc2af90d3982 (diff)
downloaddrakx-142593316e874567dfaa7164a6a7c36d46ea7f30.tar
drakx-142593316e874567dfaa7164a6a7c36d46ea7f30.tar.gz
drakx-142593316e874567dfaa7164a6a7c36d46ea7f30.tar.bz2
drakx-142593316e874567dfaa7164a6a7c36d46ea7f30.tar.xz
drakx-142593316e874567dfaa7164a6a7c36d46ea7f30.zip
notify when harddrake switched to free video driver (#39164)
-rwxr-xr-xperl-install/standalone/notify-x11-free-driver-switch16
-rwxr-xr-xperl-install/standalone/notify-x11-free-driver-switch.xsetup9
-rwxr-xr-xperl-install/standalone/service_harddrake1
3 files changed, 26 insertions, 0 deletions
diff --git a/perl-install/standalone/notify-x11-free-driver-switch b/perl-install/standalone/notify-x11-free-driver-switch
new file mode 100755
index 000000000..fd43416a1
--- /dev/null
+++ b/perl-install/standalone/notify-x11-free-driver-switch
@@ -0,0 +1,16 @@
+#!/usr/bin/perl
+use lib qw(/usr/lib/libDrakX);
+use standalone;
+use interactive;
+use common;
+
+$::isStandalone = 0;
+my $in = 'interactive'->vnew;
+my $driver = eval {
+ require Xconfig::xfree;
+ $raw_X = Xconfig::xfree->read;
+ $raw_X->get_Driver;
+} || N("unknown");
+
+$in->ask_warn(N("Warning"), N("The proprietary driver for your graphic card can not be found, the system is now using the free software driver (%s).", $driver));
+unlink $0 if $0 =~ m!/etc/X11/xsetup.d/!;
diff --git a/perl-install/standalone/notify-x11-free-driver-switch.xsetup b/perl-install/standalone/notify-x11-free-driver-switch.xsetup
new file mode 100755
index 000000000..b3a1d562d
--- /dev/null
+++ b/perl-install/standalone/notify-x11-free-driver-switch.xsetup
@@ -0,0 +1,9 @@
+#!/bin/sh
+# (c) 2005-2008 Mandriva SA
+# to be sourced
+
+LOCK=/var/run/harddrake-notify-x11-free-driver-switch;
+if [ -f $LOCK ]; then
+ /usr/share/harddrake/notify-x11-free-driver-switch
+ rm -f $LOCK;
+fi
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 1affd75e9..1788481cf 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -75,6 +75,7 @@ foreach my $card (@cards) {
substInFile { $new_driver = $1 if s!Driver "($card->{xorg_driver_regexp})"!Driver "$driver"!g } '/etc/X11/xorg.conf';
if ($new_driver) {
log::explanations("switch X.org driver from $new_driver to $driver");
+ touch('/var/run/harddrake-notify-x11-free-driver-switch');
Xconfig::card::libgl_config_and_more({ Driver => $driver });
}
}