[SCM] live-tools branch, debian-next, updated. debian/3.0.6-1-2-ged005db

Daniel Baumann daniel at debian.org
Sun Aug 5 11:07:42 UTC 2012


The following commit has been merged in the debian-next branch:
commit ed005db9d15f713b24512f5bd63643509ba7e906
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Aug 5 13:08:50 2012 +0200

    Return in cases of non-live systems with return value from update-initramfs.

diff --git a/bin/live-update-initramfs b/bin/live-update-initramfs
index e87d1a6..f29bb80 100755
--- a/bin/live-update-initramfs
+++ b/bin/live-update-initramfs
@@ -13,6 +13,7 @@ set -e
 if grep -qs "boot=live" /proc/cmdline && \
    grep -qs "\/live\/image" /proc/mounts
 then
+	# live system with live media mounted as /live/image
 	_DEVICE="$(awk '/\/live\/image/ { print $1 }' /proc/mounts)"
 
 	mount -o remount,rw ${_DEVICE} > /dev/null 2>&1 || true
@@ -26,7 +27,10 @@ then
 		_READ_WRITE="false"
 	fi
 else
+	# non-live system
 	/usr/sbin/update-initramfs.initramfs-tools "${@}"
+
+	exit "${?}"
 fi
 
 case "${_READ_WRITE}" in

-- 
live-tools



More information about the debian-live-changes mailing list