[SCM] debian-live/live-initramfs branch, master, updated. 1.107.1-1-9-gf657b6e
Daniel Baumann
daniel at debian.org
Mon Oct 8 22:37:54 UTC 2007
The branch, master has been updated
via f657b6ebad7a9b79d9fd8eabd06e80417497ffe9 (commit)
via 9b944d11dac3d6e9840622977f6d742115c3c004 (commit)
via 0cc0886c95fcd688117c4a0b84d1429ac91a56b2 (commit)
via 6c82d5de6c8774b5d16048262733b4f8c090424e (commit)
via 578754e46c26f2217237759388bcddd6f74fa6bd (commit)
via 5d5935b993950f04ff1ea94d170d0214e68298ba (commit)
via e25346172317fb9ffd4e574e92e5f5c7c511bae5 (commit)
from c06a50e25a647afaf681dbd7ea6ed3eda11202be (commit)
- Shortlog ------------------------------------------------------------
f657b6e Bumping version to 1.110.1-1.
9b944d1 Adjusting to live-initramfs.
0cc0886 Merging casper 1.110.
6c82d5d Adjusting to live-initramfs.
578754e Merging casper 1.109.
5d5935b Adjusting to live-initramfs.
e253461 Merging casper 1.108.
Summary of changes:
Makefile | 2 +-
debian/changelog | 2 +-
debian/init | 9 +++++-
docs/ChangeLog.casper | 28 +++++++++++++++++
docs/parameters.txt | 2 +-
hooks/live | 7 ++++
manpages/live-initramfs.en.7.txt | 10 ++++++
scripts/live | 35 +++++++++++++++++++++-
scripts/live-bottom/38disable_restricted_manager | 6 ++++
scripts/live-premount/10driver_updates | 19 +++++++----
10 files changed, 108 insertions(+), 12 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit f657b6ebad7a9b79d9fd8eabd06e80417497ffe9
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Oct 9 00:37:24 2007 +0200
Bumping version to 1.110.1-1.
diff --git a/Makefile b/Makefile
index eb2f7cc..8fdc89d 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ update:
sed -i -e 's/2007\\-10\\-08/2007\\-10\\-15/' \
-e 's/2007-10-08/2007-10-15/' \
-e 's/09.10.2007/15.10.2007/' \
- -e 's/1.107.2/1.107.3/' \
+ -e 's/1.110.1/1.110.2/' \
$$FILE; \
done
diff --git a/debian/changelog b/debian/changelog
index faad658..14cdef5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-live-initramfs (1.107.2-1) UNRELEASED; urgency=medium
+live-initramfs (1.110.1-1) UNRELEASED; urgency=medium
* New upstream release.
diff --git a/docs/parameters.txt b/docs/parameters.txt
index 7ebd062..4b93821 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
Boot Parameters for Debian Live
-------------------------------
-Updated for live-initramfs 1.107.2-1 on 2007-10-08.
+Updated for live-initramfs 1.110.1-1 on 2007-10-08.
These options (can be combined) work from the bootloader prompt:
commit 9b944d11dac3d6e9840622977f6d742115c3c004
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Oct 9 00:36:09 2007 +0200
Adjusting to live-initramfs.
diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager
index 6bc9cb8..16a78f3 100755
--- a/scripts/live-bottom/38disable_restricted_manager
+++ b/scripts/live-bottom/38disable_restricted_manager
@@ -31,6 +31,6 @@ rm -f /root/etc/xdg/autostart/restricted-manager-kde.desktop
# fglrx or nvidia modules either. The other restricted modules may still be
# useful.
sed -i 's/^DISABLED_MODULES=""/DISABLED_MODULES="fglrx nv"/' \
- /root/etc/default/linux-restricted-modules-common
+ /root/etc/default/linux-restricted-modules-common
log_end_msg
commit 0cc0886c95fcd688117c4a0b84d1429ac91a56b2
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Oct 9 00:35:45 2007 +0200
Merging casper 1.110.
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 4832706..f4954ba 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,11 @@
+casper (1.110) gutsy; urgency=low
+
+ * Don't generate fglrx or the nvidia modules in the live session at boot;
+ we disable restricted-manager in the live session anyway so they aren't
+ straightforward to use (see #43706). Saves about 19 MB of memory.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Fri, 05 Oct 2007 21:28:29 +0100
+
casper (1.109) gutsy; urgency=low
* Cache the stty binary before ejecting the CD.
diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager
index 2a6f1ca..6bc9cb8 100755
--- a/scripts/live-bottom/38disable_restricted_manager
+++ b/scripts/live-bottom/38disable_restricted_manager
@@ -27,4 +27,10 @@ log_begin_msg "Disabling restricted-manager..."
rm -f /root/etc/xdg/autostart/restricted-manager.desktop
rm -f /root/etc/xdg/autostart/restricted-manager-kde.desktop
+# Since we disable restricted-manager, there isn't much point generating the
+# fglrx or nvidia modules either. The other restricted modules may still be
+# useful.
+sed -i 's/^DISABLED_MODULES=""/DISABLED_MODULES="fglrx nv"/' \
+ /root/etc/default/linux-restricted-modules-common
+
log_end_msg
commit 6c82d5de6c8774b5d16048262733b4f8c090424e
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Oct 9 00:34:00 2007 +0200
Adjusting to live-initramfs.
diff --git a/scripts/live-premount/10driver_updates b/scripts/live-premount/10driver_updates
index 3ad9ef6..eda8bbf 100755
--- a/scripts/live-premount/10driver_updates
+++ b/scripts/live-premount/10driver_updates
@@ -41,12 +41,16 @@ is_updates_path ()
# kernel flavour.
path=${1}
- abi="$(uname -r)"
- kver="$(echo "$abi" | cut -d- -f1,2)"
- kbase="$(echo "$abi" | cut -d- -f1)"
- for leaf in "$abi" "$kver" "$kbase"; do
- update_dir="$path/ubuntu-drivers/$leaf"
- [ -d "$update_dir" ] || continue
+ abi="$(uname -r)"
+ kver="$(echo "$abi" | cut -d- -f1,2)"
+ kbase="$(echo "$abi" | cut -d- -f1)"
+
+ for leaf in "$abi" "$kver" "$kbase"
+ do
+ update_dir="$path/ubuntu-drivers/$leaf"
+
+ [ -d "$update_dir" ] || continue
+
if [ "$(echo ${update_dir}/*_${DPKG_ARCH}.deb)" != \
"${update_dir}/*_${DPKG_ARCH}.deb" ]
then
@@ -55,7 +59,7 @@ is_updates_path ()
fi
done
- return 1;
+ return 1
}
is_nice_device ()
commit 578754e46c26f2217237759388bcddd6f74fa6bd
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Oct 9 00:33:04 2007 +0200
Merging casper 1.109.
diff --git a/debian/init b/debian/init
index a24fe9f..d59ed45 100644
--- a/debian/init
+++ b/debian/init
@@ -68,7 +68,12 @@ do_stop ()
return 0
fi
- for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default; do
+ prompt=1
+ if grep -qs noprompt /proc/cmdline; then
+ prompt=
+ fi
+
+ for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty); do
cache_path "${path}"
done
@@ -84,6 +89,8 @@ do_stop ()
if [ -x /usr/bin/eject ]
then
eject -p -m /live/image >/dev/null 2>&1
+
+ [ "$prompt" ] || return 0
fi
stty sane < /dev/console
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index bfd3c50..4832706 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,13 @@
+casper (1.109) gutsy; urgency=low
+
+ * Cache the stty binary before ejecting the CD.
+ * Skip the CD eject prompt if 'noprompt' is on the kernel command line
+ (LP: #149159).
+ * Try each of (e.g.) 2.6.22-13-generic, 2.6.22-13, and 2.6.22 in turn as
+ directory names for driver updates (LP: #122430).
+
+ -- Colin Watson <cjwatson at ubuntu.com> Fri, 05 Oct 2007 03:24:43 +0100
+
casper (1.108) gutsy; urgency=low
* If CASPER_GENERATE_UUID is set, generate a random UUID in the initramfs,
diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index 5bc0adf..0b1a4bf 100644
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -175,6 +175,10 @@ be checked at boot time, use this parameter, otherwise they are skipped.
disables the "persistent" feature, useful if the bootloader (like syslinux) has
been installed with persistent enabled.
+ noprompt
+
+Do not prompt to eject the CD on reboot.
+
nosudo::
This parameter disables the automatic configuration of sudo.
diff --git a/scripts/live-premount/10driver_updates b/scripts/live-premount/10driver_updates
index 22d64d2..3ad9ef6 100755
--- a/scripts/live-premount/10driver_updates
+++ b/scripts/live-premount/10driver_updates
@@ -41,18 +41,19 @@ is_updates_path ()
# kernel flavour.
path=${1}
- kbase=$(uname -r | sed 's/^\([0-9]*\.[0-9]*\.[0-9]*\)-.*/\1/')
- update_dir="${path}/ubuntu-drivers/${kbase}"
-
- if [ -d "${update_dir}" ]
- then
+ abi="$(uname -r)"
+ kver="$(echo "$abi" | cut -d- -f1,2)"
+ kbase="$(echo "$abi" | cut -d- -f1)"
+ for leaf in "$abi" "$kver" "$kbase"; do
+ update_dir="$path/ubuntu-drivers/$leaf"
+ [ -d "$update_dir" ] || continue
if [ "$(echo ${update_dir}/*_${DPKG_ARCH}.deb)" != \
"${update_dir}/*_${DPKG_ARCH}.deb" ]
then
echo "${update_dir}"
- return 0;
+ return 0
fi
- fi
+ done
return 1;
}
commit 5d5935b993950f04ff1ea94d170d0214e68298ba
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Oct 9 00:29:15 2007 +0200
Adjusting to live-initramfs.
diff --git a/hooks/live b/hooks/live
index e692690..8cfc360 100755
--- a/hooks/live
+++ b/hooks/live
@@ -57,6 +57,13 @@ then
cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
fi
+# Configuration: Unique ID
+if [ -n "${LIVE_GENERATE_UUID}" ]
+then
+ mkdir -p "${DESTDIR}"/conf
+ uuidgen -r > "${DESTDIR}"/conf/uuid.conf
+fi
+
# Filesystem: cifs
if [ -x /sbin/mount.cifs ]
then
@@ -120,9 +127,3 @@ if [ -x /usr/bin/wget ]
then
copy_exec /usr/bin/wget /bin
fi
-
-if [ "$CASPER_GENERATE_UUID" ]; then
- # Unique ID
- mkdir -p $DESTDIR/conf
- uuidgen -r > $DESTDIR/conf/uuid.conf
-fi
diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index 238c810..5bc0adf 100644
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -62,8 +62,9 @@ Those parameters lets you override values read from the config file.
ignore_uuid
-Do not check that any UUID embedded in the initramfs matches the discovered medium.
-casper may be told to generate a UUID by setting CASPER_GENERATE_UUID=1 when building the initramfs.
+Do not check that any UUID embedded in the initramfs matches the discovered
+medium. live-initramfs may be told to generate a UUID by setting
+LIVE_GENERATE_UUID=1 when building the initramfs.
integrity-check::
diff --git a/scripts/live b/scripts/live
index 16a54c2..f204a1e 100755
--- a/scripts/live
+++ b/scripts/live
@@ -80,7 +80,9 @@ Arguments ()
;;
ignore_uuid)
- IGNORE_UUID="Yes" ;;
+ IGNORE_UUID="Yes"
+ export IGNORE_UUID
+ ;;
ip=*)
STATICIP="${ARGUMENT#ip=}"
@@ -437,20 +439,29 @@ is_live_path ()
return 1
}
-matches_uuid() {
- if [ "$IGNORE_UUID" ] || [ ! -e /conf/uuid.conf ]; then
- return 0
- fi
- path="$1"
- uuid="$(cat /conf/uuid.conf)"
- for try_uuid_file in "$mountpoint/.disk/casper-uuid"*; do
- [ -e "$try_uuid_file" ] || continue
- try_uuid="$(cat "$try_uuid_file")"
- if [ "$uuid" = "$try_uuid" ]; then
- return 0
- fi
- done
- return 1
+matches_uuid ()
+{
+ if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
+ then
+ return 0
+ fi
+
+ path="${1}"
+ uuid="$(cat /conf/uuid.conf)"
+
+ for try_uuid_file in "${mountpoint}/.disk/casper-uuid"*
+ do
+ [ -e "${try_uuid_file}" ] || continue
+
+ try_uuid="$(cat "${try_uuid_file}")"
+
+ if [ "${uuid}" = "${try_uuid}" ]
+ then
+ return 0
+ fi
+ done
+
+ return 1
}
get_backing_device ()
@@ -1023,7 +1034,8 @@ check_dev ()
if is_live_path ${mountpoint}
if is_live_path $mountpoint && \
- ([ "$skip_uuid_check" ] || matches_uuid $mountpoint); then
+ ([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
+ then
echo ${mountpoint}
return 0
else
commit e25346172317fb9ffd4e574e92e5f5c7c511bae5
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Oct 9 00:24:11 2007 +0200
Merging casper 1.108.
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index b1f55c9..bfd3c50 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,13 @@
+casper (1.108) gutsy; urgency=low
+
+ * If CASPER_GENERATE_UUID is set, generate a random UUID in the initramfs,
+ and check it against the discovered medium (unless booting with the
+ ignore_uuid parameter). This allows live CD images to be safely copied
+ to the hard disk without causing problems when booting future live CDs
+ (LP: #144800).
+
+ -- Colin Watson <cjwatson at ubuntu.com> Thu, 04 Oct 2007 14:23:37 +0100
+
casper (1.107) gutsy; urgency=low
* Fix gconf keys for suspend and hibernate (thanks, Oliver Grawert;
diff --git a/hooks/live b/hooks/live
index a59fe3b..e692690 100755
--- a/hooks/live
+++ b/hooks/live
@@ -120,3 +120,9 @@ if [ -x /usr/bin/wget ]
then
copy_exec /usr/bin/wget /bin
fi
+
+if [ "$CASPER_GENERATE_UUID" ]; then
+ # Unique ID
+ mkdir -p $DESTDIR/conf
+ uuidgen -r > $DESTDIR/conf/uuid.conf
+fi
diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index c197abb..238c810 100644
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -60,6 +60,11 @@ copying to ram and booting it.
Those parameters lets you override values read from the config file.
+ ignore_uuid
+
+Do not check that any UUID embedded in the initramfs matches the discovered medium.
+casper may be told to generate a UUID by setting CASPER_GENERATE_UUID=1 when building the initramfs.
+
integrity-check::
If specified, an MD5 sum is calculated on the live media during boot and
diff --git a/scripts/live b/scripts/live
index ebac3ae..16a54c2 100755
--- a/scripts/live
+++ b/scripts/live
@@ -79,6 +79,9 @@ Arguments ()
export USERFULLNAME LIVECONF
;;
+ ignore_uuid)
+ IGNORE_UUID="Yes" ;;
+
ip=*)
STATICIP="${ARGUMENT#ip=}"
@@ -434,6 +437,22 @@ is_live_path ()
return 1
}
+matches_uuid() {
+ if [ "$IGNORE_UUID" ] || [ ! -e /conf/uuid.conf ]; then
+ return 0
+ fi
+ path="$1"
+ uuid="$(cat /conf/uuid.conf)"
+ for try_uuid_file in "$mountpoint/.disk/casper-uuid"*; do
+ [ -e "$try_uuid_file" ] || continue
+ try_uuid="$(cat "$try_uuid_file")"
+ if [ "$uuid" = "$try_uuid" ]; then
+ return 0
+ fi
+ done
+ return 1
+}
+
get_backing_device ()
{
case "${1}" in
@@ -983,6 +1002,7 @@ check_dev ()
{
sysdev="${1}"
devname="${2}"
+ skip_uuid_check="${3}"
if [ -z "${devname}" ]
then
@@ -1002,7 +1022,8 @@ check_dev ()
mount -t ${fstype} -o ro,noatime,nodiratime "${devname}" ${mountpoint} || continue
if is_live_path ${mountpoint}
- then
+ if is_live_path $mountpoint && \
+ ([ "$skip_uuid_check" ] || matches_uuid $mountpoint); then
echo ${mountpoint}
return 0
else
@@ -1025,7 +1046,7 @@ find_livefs ()
# first look at the one specified in the command line
if [ ! -z "${LIVE_MEDIA}" ]
then
- if check_dev "null" "${LIVE_MEDIA}"
+ if check_dev "null" "${LIVE_MEDIA}" "skip_uuid_check"
then
return 0
fi
--
debian-live/live-initramfs
More information about the debian-live-changes
mailing list