Merging casper 1.124.

grml · Mar 21, 2008 · a25de86 · a25de86
1 parent 3c05e22
commit a25de86
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git 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,6 +331,18 @@ Defaults ()
 				;;
 		esac
 
+               case "${TYPE}" in
+                       cpio)
+                               DEST="${MOUNTP}/casper-sn.cpio.gz" ;;
+                       squashfs)
+                               DEST="${MOUNTP}/casper-sn.squashfs" ;;
+                       ext2)
+                               DEST="${MOUNTP}/casper-sn.ext2" ;;
+                       *)
+                               echo "Internal error."
+                               exit 1
+                               ;;
+               esac
 		#if [ -d
 		#if Is_same_mount
 	fi

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
@@ -1,3 +1,15 @@
+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

diff --git a/scripts/live-bottom/44pk_allow b/scripts/live-bottom/44pk_allow
@@ -28,7 +28,6 @@ log_begin_msg "Grant administrative PolicyKit pivilieges to default user..."
 
 # 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"