xorg: Changes to 'ubuntu'
debian/changelog | 8 ++++++++
debian/x11-common.failsafe-x.upstart | 5 ++++-
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit b9fbd9b9123c168f6d012846c4ecaa4d6c12f99f
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Mon Dec 14 14:04:59 2009 -0800
Patch from Mario to fix DKMS handling
diff --git a/debian/changelog b/debian/changelog
index d4b794c..0cf7a69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.5~3ubuntu3) lucid; urgency=low
+
+ * debian/x11-common.failsafe-x.upstart: (LP: #453365)
+ - Start on the build-failed signal that DKMS may emit
+ during a failed build for nvidia or fglrx.
+
+ -- Mario Limonciello <mario_limonciello@dell.com> Mon, 14 Dec 2009 14:17:21 -0600
+
xorg (1:7.5~3ubuntu2) lucid; urgency=low
* scripts/vars.*: Drop wacom from input-all until it builds again.
diff --git a/debian/x11-common.failsafe-x.upstart b/debian/x11-common.failsafe-x.upstart
index b258faa..ac5ef7b 100644
--- a/debian/x11-common.failsafe-x.upstart
+++ b/debian/x11-common.failsafe-x.upstart
@@ -5,7 +5,10 @@
description "Recovery options if gdm fails to start"
-start on stopped gdm EXIT_STATUS=[!0]
+start on (stopped gdm EXIT_STATUS=[!0]
+ or (stopped gdm
+ and (build-failed MODULE=nvidia
+ or build-failed MODULE=fglrx)))
stop on runlevel [06]
task
Reply to: