From d27400ce146c5e3a340eec8f614012ced2ddc29b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 22 Dec 2007 10:23:50 +0100
Subject: Merging casper 1.113.

---
 scripts/live-bottom/10adduser                 |  2 +-
 scripts/live-bottom/43disable_updateinitramfs | 36 +++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100755 scripts/live-bottom/43disable_updateinitramfs

(limited to 'scripts')

diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
index e5067dd..1a80e26 100755
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -59,7 +59,7 @@ EOF
 
 if [ -z "${NOSUDO}" ]
 then
-	if [ -f /root/etc/sudoers ]
+	if ! grep -q "${USERNAME}" /root/etc/sudoers
 	then
 		echo "${USERNAME}  ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
 
diff --git a/scripts/live-bottom/43disable_updateinitramfs b/scripts/live-bottom/43disable_updateinitramfs
new file mode 100755
index 0000000..095bf74
--- /dev/null
+++ b/scripts/live-bottom/43disable_updateinitramfs
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Fix for LP#150188
+
+PREREQ=""
+DESCRIPTION="Disabling update-initramfs (useless on a live CD)..."
+
+. /scripts/casper-functions
+
+prereqs()
+{
+       echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+       prereqs
+       exit 0
+       ;;
+esac
+
+log_begin_msg "$DESCRIPTION"
+
+chroot /root dpkg-divert --add --rename --quiet \
+        /usr/sbin/update-initramfs
+cat > /root/usr/sbin/update-initramfs <<EOF
+#! /bin/sh
+
+echo "update-initramfs is disabled since running on a live CD"
+exit 0
+
+EOF
+
+chmod 755 /root/usr/sbin/update-initramfs
+
+log_end_msg
-- 
cgit v1.2.3