[SCM] debian-live/live-initramfs branch, master, updated. 1.110.7-1-7-ga6aba0c
Daniel Baumann
daniel at debian.org
Sat Dec 22 09:27:36 UTC 2007
The branch, master has been updated
via a6aba0ca17a5b1138d95ff20dd28b1bb3548de54 (commit)
via 5d2521e666948442721a39a9c5e50175e513faf3 (commit)
via 2f071d6810e0e91be11a2f0c29f42912ca6456cb (commit)
via 1011d3474610e0a43ed9f4a8091b32ebc6f1c248 (commit)
from ee4dcceabed9562b5e012b5624660b92f8432192 (commit)
- Shortlog ------------------------------------------------------------
a6aba0c Bumping version to 1.113.1-1.
5d2521e Adjusting to live-initramfs.
2f071d6 Merging casper 1.113.
1011d34 Merging casper 1.112.
Summary of changes:
Makefile | 2 +-
debian/changelog | 2 +-
debian/init | 3 ++
docs/ChangeLog.casper | 26 ++++++++++++++++
docs/parameters.txt | 2 +-
scripts/live-bottom/10adduser | 2 +-
scripts/live-bottom/43disable_updateinitramfs | 41 +++++++++++++++++++++++++
7 files changed, 74 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit a6aba0ca17a5b1138d95ff20dd28b1bb3548de54
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Dec 22 10:27:24 2007 +0100
Bumping version to 1.113.1-1.
diff --git a/Makefile b/Makefile
index f9c9ffe..dd0a6b9 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ update:
sed -i -e 's/2007\\-11\\-19/2007\\-11\\-26/' \
-e 's/2007-11-19/2007-11-26/' \
-e 's/19.11.2007/26.11.2007/' \
- -e 's/1.111.1/1.111.2/' \
+ -e 's/1.113.1/1.113.2/' \
$$FILE; \
done
diff --git a/debian/changelog b/debian/changelog
index 8a4ced4..98df926 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-live-initramfs (1.111.1-1) UNRELEASED; urgency=medium
+live-initramfs (1.113.1-1) UNRELEASED; urgency=medium
* New upstream release.
diff --git a/docs/parameters.txt b/docs/parameters.txt
index 851aa25..a9ac3ed 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
Boot Parameters for Debian Live
-------------------------------
-Updated for live-initramfs 1.111.1-1 on 2007-11-19.
+Updated for live-initramfs 1.113.1-1 on 2007-11-26.
These options (can be combined) work from the bootloader prompt:
commit 5d2521e666948442721a39a9c5e50175e513faf3
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Dec 22 10:26:22 2007 +0100
Adjusting to live-initramfs.
diff --git a/scripts/live-bottom/43disable_updateinitramfs b/scripts/live-bottom/43disable_updateinitramfs
index 095bf74..a973843 100755
--- a/scripts/live-bottom/43disable_updateinitramfs
+++ b/scripts/live-bottom/43disable_updateinitramfs
@@ -1,36 +1,41 @@
#!/bin/sh
-# Fix for LP#150188
-PREREQ=""
-DESCRIPTION="Disabling update-initramfs (useless on a live CD)..."
+#set -e
+
+# initramfs-tools header
-. /scripts/casper-functions
+PREREQ=""
prereqs()
{
- echo "$PREREQ"
+ echo "${PREREQ}"
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+. /scripts/live-functions
+
+log_begin_msg "Disabling update-initramfs (useless on a live CD)..."
+
+# live-initramfs script
chroot /root dpkg-divert --add --rename --quiet \
- /usr/sbin/update-initramfs
+ /usr/sbin/update-initramfs
+
cat > /root/usr/sbin/update-initramfs <<EOF
-#! /bin/sh
+#!/bin/sh
echo "update-initramfs is disabled since running on a live CD"
exit 0
-
EOF
-chmod 755 /root/usr/sbin/update-initramfs
+chmod 0755 /root/usr/sbin/update-initramfs
log_end_msg
commit 2f071d6810e0e91be11a2f0c29f42912ca6456cb
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Dec 22 10:23:50 2007 +0100
Merging casper 1.113.
diff --git a/debian/init b/debian/init
index d59ed45..149314b 100644
--- a/debian/init
+++ b/debian/init
@@ -24,6 +24,9 @@ DO_SNAPSHOT=/sbin/live-snapshot
# Exit if system was not booted by live-initramfs
grep -qs boot=live /proc/cmdline || exit 0
+# Exit if the system was booted from an ISO image rather than a physical CD
+grep -qs find_iso= /proc/cmdline && exit 0
+
# Read configuration variable file if it is present
[ -r /etc/live.conf ] && . /etc/live.conf
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 9b578ef..9b80ec8 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,18 @@
+casper (1.113) hardy; urgency=low
+
+ [ Tollef Fog Heen ]
+ * dpkg-divert away update-initramfs as it's useless on live CDs and
+ annoying when people install LVM and similar tools in order to rescue
+ a system. LP: #150188
+
+ [ Colin Watson ]
+ * Adjust /etc/sudoers editing code so that it doesn't repeatedly add
+ "NOPASSWD:" in persistent mode (LP: #175159).
+ * Avoid ejecting the CD if booting from an ISO image rather than from a
+ physical CD (thanks, Agostino Russo; LP: #176014).
+
+ -- Colin Watson <cjwatson at ubuntu.com> Wed, 19 Dec 2007 09:17:50 +0000
+
casper (1.112) hardy; urgency=low
* hooks/casper: no need to copy udevinfo into the initramfs, it's already
diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
index e5067dd..1a80e26 100755
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -59,7 +59,7 @@ EOF
if [ -z "${NOSUDO}" ]
then
- if [ -f /root/etc/sudoers ]
+ if ! grep -q "${USERNAME}" /root/etc/sudoers
then
echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
diff --git a/scripts/live-bottom/43disable_updateinitramfs b/scripts/live-bottom/43disable_updateinitramfs
new file mode 100755
index 0000000..095bf74
--- /dev/null
+++ b/scripts/live-bottom/43disable_updateinitramfs
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Fix for LP#150188
+
+PREREQ=""
+DESCRIPTION="Disabling update-initramfs (useless on a live CD)..."
+
+. /scripts/casper-functions
+
+prereqs()
+{
+ echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+ prereqs
+ exit 0
+ ;;
+esac
+
+log_begin_msg "$DESCRIPTION"
+
+chroot /root dpkg-divert --add --rename --quiet \
+ /usr/sbin/update-initramfs
+cat > /root/usr/sbin/update-initramfs <<EOF
+#! /bin/sh
+
+echo "update-initramfs is disabled since running on a live CD"
+exit 0
+
+EOF
+
+chmod 755 /root/usr/sbin/update-initramfs
+
+log_end_msg
commit 1011d3474610e0a43ed9f4a8091b32ebc6f1c248
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Dec 22 10:12:50 2007 +0100
Merging casper 1.112.
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 2c0edde..9b578ef 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,14 @@
+casper (1.112) hardy; urgency=low
+
+ * hooks/casper: no need to copy udevinfo into the initramfs, it's already
+ there inside udevadm
+ * scripts/casper: call udevadm with trigger and settle arguments
+ * scripts/casper-bottom/23networking: call udevadm with trigger and
+ settle arguments
+ * scripts/casper-helpers: call udevadm with info and settle arguments
+
+ -- Scott James Remnant <scott at ubuntu.com> Fri, 14 Dec 2007 15:00:29 +0000
+
casper (1.111) hardy; urgency=low
* Remove code to set the progress bar to throbbing, this now comes as
--
debian-live/live-initramfs
More information about the debian-live-changes
mailing list