From 1afb4883d090d72662ce3afad936025cb1c35201 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 1 May 2010 12:08:48 +0200
Subject: [PATCH] Merging casper 1.201.

---
 debian/live-initramfs.init     | 15 +++++++++++++++
 docs/ChangeLog.casper          | 13 +++++++++++++
 scripts/live-bottom/44pk_allow | 11 +++++++++++
 3 files changed, 39 insertions(+)

diff --git a/debian/live-initramfs.init b/debian/live-initramfs.init
index 618607c..92e42b3 100644
--- a/debian/live-initramfs.init
+++ b/debian/live-initramfs.init
@@ -116,6 +116,21 @@ do_stop ()
 		return 0
 	fi
 
+	# Don't prompt to eject the SD card on Babbage board, where we reuse it
+	# as a quasi-boot-floppy. Technically this uses a bit of ubiquity
+	# (archdetect), but since this is mostly only relevant for
+	# installations, who cares ...
+	if type archdetect >/dev/null 2>&1
+	then
+		subarch="$(archdetect)"
+
+		case $subarch in
+			arm*/imx51)
+				return 0
+				;;
+		esac
+	fi
+
 	prompt=1
 	if grep -qs noprompt /proc/cmdline
 	then
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 9778ece..1042bb0 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,16 @@
+casper (1.201) karmic; urgency=low
+
+  [ Colin Watson ]
+  * Don't prompt to eject the SD card on Babbage boards, since for now it's
+    reused as a quasi-boot-floppy (LP: #364273).
+
+  [ James Westby ]
+  * scripts/casper-bottom/44pk_allow_ubuntu: update to work for polkit-1
+    as well. Allow the live cd user to perform any action when at the
+    active console. (LP: #447141)
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 09 Oct 2009 16:06:53 +0100
+
 casper (1.200) karmic; urgency=low
 
   * scripts/casper-bottom/20xconfig:
diff --git a/scripts/live-bottom/44pk_allow b/scripts/live-bottom/44pk_allow
index fec6401..a211880 100755
--- a/scripts/live-bottom/44pk_allow
+++ b/scripts/live-bottom/44pk_allow
@@ -57,4 +57,15 @@ cat << EOF >> /root/etc/PolicyKit/PolicyKit.conf
 </config>
 EOF
 
+mkdir -p /root/var/lib/polkit-1/localauthority/10-vendor.d
+cat << EOF > /root/var/lib/polkit-1/localauthority/10-vendor.d/10-live-cd.pkla
+# Policy to allow the livecd user to bypass policykit
+[Live CD user permissions]
+Identity=unix-user:$USERNAME
+Action=*
+ResultAny=no
+ResultInactive=no
+ResultActive=yes
+EOF
+
 log_end_msg
-- 
2.1.4