From b587ded83cdb9e2c281c7030b08caf6fe5148b5b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 18 Apr 2010 20:41:49 +0200
Subject: [PATCH] Adding upstream version 1.124.1.

---
 bin/live-snapshot              | 22 ++++++++++++++++---
 docs/ChangeLog.casper          | 41 ++++++++++++++++++++++++++++++++++
 scripts/live                   |  4 ++--
 scripts/live-bottom/44pk_allow | 50 ++++++++++++++++++++++++++++++++++++++++++
 scripts/live-bottom/99hook     |  2 +-
 5 files changed, 113 insertions(+), 6 deletions(-)
 create mode 100755 scripts/live-bottom/44pk_allow

diff --git a/bin/live-snapshot b/bin/live-snapshot
index ffa4670..5135ce3 100755
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -57,7 +57,7 @@ fi
 MOUNTP=""
 COW=""
 DEV=""
-DEST=""
+DEST="${MOUNTP}/live-sn.cpio.gz"
 TYPE=""
 DESKTOP_LINK=""
 
@@ -331,8 +331,24 @@ Defaults ()
 				;;
 		esac
 
-		#if [ -d
-		#if Is_same_mount
+		case "${TYPE}" in
+			cpio)
+				DEST="${MOUNTP}/live-sn.cpio.gz"
+				;;
+
+			squashfs)
+				DEST="${MOUNTP}/live-sn.squashfs"
+				;;
+
+			ext2)
+				DEST="${MOUNTP}/live-sn.ext2"
+				;;
+
+			*)
+				echo "Internal error."
+				exit 1
+			;;
+		esac
 	fi
 
 	# check vars
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index da4cef2..efa0f44 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,44 @@
+casper (1.124) hardy; urgency=low
+
+  [ Colin Watson ]
+  * Name generated snapshot images according to their type (LP: #202699).
+
+  [ Martin Pitt ]
+  * scripts/casper-bottom/44pk_allow_ubuntu: Remove erroneous blank line at
+    the start of PolicyKit.conf, since this is invalid XML. This broke
+    PolicyKit completely on the live system.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 18 Mar 2008 10:20:08 +0100
+
+casper (1.123) hardy; urgency=low
+
+  * Add scripts/casper-bottom/44pk_allow_ubuntu: Allow PolicyKit privileges
+    without password to the default live session user. This avoids the need to
+    press Enter at the password prompt, which is quite confusing. Thanks to
+    MarioDebian! (LP: #201852)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 14 Mar 2008 17:26:37 +0100
+
+casper (1.122) hardy; urgency=low
+
+  * Fix paths in About Kubuntu links
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 14 Mar 2008 15:12:38 +0000
+
+casper (1.121) hardy; urgency=low
+
+  * Use a link for About Kubuntu docs in Kubuntu-KDE4
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 12 Mar 2008 23:57:50 +0000
+
+casper (1.120) hardy; urgency=low
+
+  * Use dhclient directly instead of ifupdown for the url= kernel cmdline
+    argument so that we don't have to worry about the interfaces file
+    propagating to the installed system.
+
+ -- Evan Dandrea <evand@ubuntu.com>  Tue, 11 Mar 2008 13:08:08 -0400
+
 casper (1.119) hardy; urgency=low
 
   [ Luke Yelavich ]
diff --git a/scripts/live b/scripts/live
index 6494234..03905b5 100755
--- a/scripts/live
+++ b/scripts/live
@@ -322,9 +322,9 @@ Arguments ()
 				mount -n -o bind /dev /root/dev
 
 				mkdir -p /root/var/run/network
-				chroot /root ifup -a
+				chroot /root dhclient eth0
 				chroot /root wget -P /tmp "${location}"
-				chroot /root ifdown -a
+				chroot /root ifconfig eth0 down
 
 				umount /root/sys
 				umount /root/proc
diff --git a/scripts/live-bottom/44pk_allow b/scripts/live-bottom/44pk_allow
new file mode 100755
index 0000000..6ed8d96
--- /dev/null
+++ b/scripts/live-bottom/44pk_allow
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+#set -e
+
+# initramfs-tools header
+
+PREREQ=""
+
+prereqs()
+{
+	echo "${PREREQ}"
+}
+
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
+esac
+
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Grant administrative PolicyKit pivilieges to default user..."
+
+# live-initramfs script
+
+# configure PolicyKit in live session
+cat << EOF > /root/etc/PolicyKit/PolicyKit.conf
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
+<!DOCTYPE pkconfig PUBLIC "-//freedesktop//DTD PolicyKit Configuration 1.0//EN"
+"http://hal.freedesktop.org/releases/PolicyKit/1.0/config.dtd">
+
+<!-- See the manual page PolicyKit.conf(5) for file format -->
+
+<config version="0.1">
+	<match user="root">
+		<return result="yes"/>
+	</match>
+	<!-- don't ask password for user in live session -->
+	<match user="$USERNAME">
+		<return result="yes"/>
+	</match>
+	<define_admin_auth group="admin"/>
+</config>
+EOF
+
+log_end_msg
diff --git a/scripts/live-bottom/99hook b/scripts/live-bottom/99hook
index dd027ab..a27a96a 100755
--- a/scripts/live-bottom/99hook
+++ b/scripts/live-bottom/99hook
@@ -32,7 +32,7 @@ log_begin_msg "Executing custom hook script..."
 # live-initramfs script
 
 cd /root
-wget "${HOOK}"
+chroot /root wget "${HOOK}"
 
 FILE="$(basename ${HOOK})"
 
-- 
2.1.4