[Debian-live-changes] r1983 - in dists/trunk/live-initramfs: . debian docs manpages scripts
daniel at alioth.debian.org
daniel at alioth.debian.org
Fri Jun 8 07:54:44 UTC 2007
Author: daniel
Date: 2007-06-08 07:54:44 +0000 (Fri, 08 Jun 2007)
New Revision: 1983
Modified:
dists/trunk/live-initramfs/Makefile
dists/trunk/live-initramfs/debian/changelog
dists/trunk/live-initramfs/docs/ChangeLog
dists/trunk/live-initramfs/docs/ChangeLog.casper
dists/trunk/live-initramfs/manpages/live-initramfs.en.7
dists/trunk/live-initramfs/manpages/live-snapshot.en.1
dists/trunk/live-initramfs/scripts/live-helpers
Log:
Modified: dists/trunk/live-initramfs/Makefile
===================================================================
--- dists/trunk/live-initramfs/Makefile 2007-06-08 07:24:33 UTC (rev 1982)
+++ dists/trunk/live-initramfs/Makefile 2007-06-08 07:54:44 UTC (rev 1983)
@@ -118,7 +118,7 @@
set -e; for MANPAGE in manpages/*.en.*; \
do \
sed -i -e 's/2007\\-06\\-04/2007\\-06\\-11/' \
- -e 's/1.87.6/1.87.7/' \
+ -e 's/1.87.6/1.88.1/' \
$$MANPAGE; \
done
Modified: dists/trunk/live-initramfs/debian/changelog
===================================================================
--- dists/trunk/live-initramfs/debian/changelog 2007-06-08 07:24:33 UTC (rev 1982)
+++ dists/trunk/live-initramfs/debian/changelog 2007-06-08 07:54:44 UTC (rev 1983)
@@ -1,3 +1,9 @@
+live-initramfs (1.88.1-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org> Mon, 11 Jun 2007 00:00:00 +0200
+
live-initramfs (1.87.6-1) unstable; urgency=medium
* New upstream release.
Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog 2007-06-08 07:24:33 UTC (rev 1982)
+++ dists/trunk/live-initramfs/docs/ChangeLog 2007-06-08 07:54:44 UTC (rev 1983)
@@ -1,3 +1,7 @@
+2007-06-08 Daniel Baumann <daniel at debian.org>
+
+ * Merging changes from casper 1.88.
+
2007-06-04 Daniel Baumann <daniel at debian.org>
* Uploaded 1.87.6-1.
Modified: dists/trunk/live-initramfs/docs/ChangeLog.casper
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog.casper 2007-06-08 07:24:33 UTC (rev 1982)
+++ dists/trunk/live-initramfs/docs/ChangeLog.casper 2007-06-08 07:54:44 UTC (rev 1983)
@@ -1,3 +1,17 @@
+casper (1.88) gutsy; urgency=low
+
+ * Add default values for root_persistence, home_persistence,
+ root_snapshot_label, and home_snapshot_label, and parse the persistent
+ command-line option, which went missing in the last merge from Debian.
+ This goes some way towards LP #84591 but doesn't quite fix it for me
+ since the USB stick inexplicably doesn't appear until a little too late.
+ * Use 'losetup -f' instead of walking /sys/block/loop*. Requires
+ busybox-initramfs 1:1.1.3-4ubuntu3.
+ * Install temporary workaround for /dev/loop* breakage in post-2.6.21
+ kernels (LP: #118561).
+
+ -- Colin Watson <cjwatson at ubuntu.com> Mon, 04 Jun 2007 16:26:59 +0100
+
casper (1.87) feisty; urgency=low
[ Colin Watson ]
Modified: dists/trunk/live-initramfs/manpages/live-initramfs.en.7
===================================================================
--- dists/trunk/live-initramfs/manpages/live-initramfs.en.7 2007-06-08 07:24:33 UTC (rev 1982)
+++ dists/trunk/live-initramfs/manpages/live-initramfs.en.7 2007-06-08 07:54:44 UTC (rev 1983)
@@ -1,4 +1,4 @@
-.TH LIVE\-INITRAMFS 7 "2007\-06\-04" "1.87.6" "live\-initramfs"
+.TH LIVE\-INITRAMFS 7 "2007\-06\-11" "1.88.1" "live\-initramfs"
.SH NAME
live\-initramfs \- Debian Live initramfs hook
Modified: dists/trunk/live-initramfs/manpages/live-snapshot.en.1
===================================================================
--- dists/trunk/live-initramfs/manpages/live-snapshot.en.1 2007-06-08 07:24:33 UTC (rev 1982)
+++ dists/trunk/live-initramfs/manpages/live-snapshot.en.1 2007-06-08 07:54:44 UTC (rev 1983)
@@ -1,4 +1,4 @@
-.TH LIVE\-SNAPSHOT 1 "2007\-06\-04" "1.87.6" "live\-initramfs"
+.TH LIVE\-SNAPSHOT 1 "2007\-06\-11" "1.88.1" "live\-initramfs"
.SH NAME
live\-snapshot \- a simple script to ease persistence usage
Modified: dists/trunk/live-initramfs/scripts/live-helpers
===================================================================
--- dists/trunk/live-initramfs/scripts/live-helpers 2007-06-08 07:24:33 UTC (rev 1982)
+++ dists/trunk/live-initramfs/scripts/live-helpers 2007-06-08 07:54:44 UTC (rev 1983)
@@ -126,9 +126,16 @@
modprobe ${MP_QUIET} -b "$module"
udevsettle
- for loopdev in $pattern; do
- if [ "$(cat $loopdev/size)" -eq 0 ]; then
- dev=$(sys2dev "${loopdev}")
+ if [ "$module" = loop ]; then
+ if [ ! -e /dev/loop0 ]; then
+ # temporary workaround for kernel bug
+ for i in 0 1 2 3 4 5 6 7; do
+ mknod "/dev/loop$i" b 7 "$i" || true
+ done
+ fi
+
+ dev="$(losetup -f)"
+ if [ "$dev" ]; then
options=''
if [ 0 -lt "${offset}" ]; then
options="${options} -o ${offset}"
@@ -161,9 +168,49 @@
fi
echo "$dev"
return 0
+ else
+ panic "No loop devices available"
fi
- done
- panic "No loop devices available"
+ else
+ for loopdev in $pattern; do
+ if [ "$(cat $loopdev/size)" -eq 0 ]; then
+ dev=$(sys2dev "${loopdev}")
+ options=''
+ if [ 0 -lt "${offset}" ]; then
+ options="${options} -o ${offset}"
+ fi
+ if [ -z "${encryption}" ]; then
+ losetup ${options} "${dev}" "${fspath}"
+ else
+ # Loop AES encryption
+ while true; do
+ load_keymap
+ echo -n "Enter passphrase for ${fspath}: " >&6
+ read -s passphrase
+ echo "${passphrase}" > /tmp/passphrase
+ exec 9</tmp/passphrase
+ /sbin/losetup ${options} -e "${encryption}" -p 9 "${dev}" "${fspath}"
+ error=$?
+ exec 9<&-
+ rm -f /tmp/passphrase
+ if [ 0 -eq ${error} ]; then
+ unset error
+ break
+ fi
+ echo -n "Something went wrong... Retry? [YES/no] " >&6
+ read answer
+ if [ 'no' = "${answer}" ]; then
+ unset answer
+ break
+ fi
+ done
+ fi
+ echo "$dev"
+ return 0
+ fi
+ done
+ panic "No loop devices available"
+ fi
}
try_mount ()
More information about the Debian-live-changes
mailing list