From 9fda4b0552744a305a699855e2ad3907e8cab164 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 14:46:30 +0200
Subject: Adding casper 1.81+debian-1.

---
 scripts/casper-bottom/22screensaver             | 12 +++---------
 scripts/casper-bottom/23networking              | 12 ++++--------
 scripts/casper-bottom/31disable_update_notifier | 10 +++++++++-
 3 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'scripts/casper-bottom')

diff --git a/scripts/casper-bottom/22screensaver b/scripts/casper-bottom/22screensaver
index e5965e8..39c0f22 100755
--- a/scripts/casper-bottom/22screensaver
+++ b/scripts/casper-bottom/22screensaver
@@ -20,17 +20,11 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-
 gnome_screensaver_version=$(chroot /root dpkg-query -W --showformat='${Version}' gnome-screensaver 2>/dev/null) || gnome_screensaver_version=""
-
-if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
-	gnome_screensaver_lock="/apps/gnome-screensaver/lock"
-else
-	gnome_screensaver_lock="/apps/gnome-screensaver/lock_enabled"
-fi
-	
 if [ -n "$gnome_screensaver_version" ]; then
-    chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s "${gnome_screensaver_lock}" false
+    # Support legacy gconf value
+    chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock false
+    chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock_enabled false
 fi
 
 log_end_msg
diff --git a/scripts/casper-bottom/23networking b/scripts/casper-bottom/23networking
index 116b1d6..cfc565d 100755
--- a/scripts/casper-bottom/23networking
+++ b/scripts/casper-bottom/23networking
@@ -21,7 +21,7 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-if [ "${STATICIP}" == "frommedia" -a -e  "$IFFILE" ] ; then
+if [ "${STATICIP}" = "frommedia" -a -e  "$IFFILE" ] ; then
     # will use existent /etc/network/interfaces
     log_end_msg
     exit 0
@@ -33,11 +33,7 @@ iface lo inet loopback
 
 EOF
 
-if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
-    udevtrigger -Bpci -Iclass="0x02*"
-else
-    udevtrigger
-fi
+udevtrigger
 udevsettle
 
 if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]; then
@@ -71,8 +67,8 @@ else
         [ -e $interface ] || continue
         i="$(basename $interface)"
         cat >> "$IFFILE" <<EOF
-auto ${i}
-iface ${i} inet ${method}
+auto $i
+iface $i inet ${method}
 
 EOF
     done
diff --git a/scripts/casper-bottom/31disable_update_notifier b/scripts/casper-bottom/31disable_update_notifier
index 10b86a2..2461c25 100755
--- a/scripts/casper-bottom/31disable_update_notifier
+++ b/scripts/casper-bottom/31disable_update_notifier
@@ -20,7 +20,15 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-rm -f /root/etc/xdg/autostart/update-notifier.desktop
+# For GNOME, we divert away apt-check to avoid a regular 'apt-get update'
+# equivalent in the live session. We want to run update-notifier for crash
+# report handling.
+chroot /root dpkg-divert --add --rename --quiet \
+	/usr/lib/update-notifier/apt-check
+ln -s /bin/true /root/usr/lib/update-notifier/apt-check
+
+# For KDE, adept_notifier's only useful function at the moment is an
+# 'apt-get update' equivalent, so we disable it entirely.
 rm -f /root/usr/share/autostart/adept_notifier_auto.desktop
 
 log_end_msg
-- 
cgit v1.2.3