diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-03-21 07:57:11 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:44:53 +0100 |
| commit | f0d756e45675fbf829e8ee71ded7c42126dd43ab (patch) | |
| tree | 41a0de2732431514f00e6a94019dc45a3907feb3 | |
| parent | 64be9d84a425d267338004c0832ca5c9a79ed312 (diff) | |
| download | live-boot-f0d756e45675fbf829e8ee71ded7c42126dd43ab.tar.gz live-boot-f0d756e45675fbf829e8ee71ded7c42126dd43ab.zip | |
Merging casper 1.124.
| -rwxr-xr-x | bin/live-snapshot | 14 | ||||
| -rw-r--r-- | docs/ChangeLog.casper | 12 | ||||
| -rwxr-xr-x | scripts/live-bottom/44pk_allow | 1 |
3 files changed, 25 insertions, 2 deletions
diff --git a/bin/live-snapshot b/bin/live-snapshot index ffa4670..6e4409c 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,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 index d1b8fe2..efa0f44 100644 --- 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 index fe5a507..6ed8d96 100755 --- 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" |