[SCM] live-initramfs branch, master, updated. debian/1.173.5-1-7-g930e7e2
Daniel Baumann
daniel at debian.org
Tue Mar 16 18:12:46 UTC 2010
The following commit has been merged in the master branch:
commit 930e7e2df8619622ed337424d28770abe7bc4195
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Mar 16 19:08:23 2010 +0100
Merging casper 1.176.
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index a172b09..b4274f4 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,18 @@
+casper (1.176) karmic; urgency=low
+
+ [ Colin Watson ]
+ * Fix symlinking of anacron to /bin/true.
+
+ [ Martin Pitt ]
+ * Drop scripts/casper-bottom/38jockey_disable_check: Some drivers, like wl
+ or printer drivers, do need to be advertised in a live system. Jockey has
+ been fixed to not advertise video drivers automatically if the packages
+ aren't available (such as in the live system), and even if we should ever
+ put them back, it is easier to disable the notifications in jockey's
+ handlers instead of here. (LP: #381687)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Tue, 02 Jun 2009 15:40:05 +0200
+
casper (1.175) karmic; urgency=low
* Suppress error message if
diff --git a/scripts/live-bottom/38jockey_disable_check b/scripts/live-bottom/38jockey_disable_check
deleted file mode 100755
index 1a642e1..0000000
--- a/scripts/live-bottom/38jockey_disable_check
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-if [ -n "${NOJOCKEY}" ]
-then
- exit 0
-fi
-
-. /scripts/live-functions
-
-log_begin_msg "Disabling jockey driver check"
-
-rm -f /root/etc/xdg/autostart/jockey*.desktop
-
-log_end_msg
--
live-initramfs
More information about the debian-live-changes
mailing list