[SCM] live-boot branch, debian, updated. debian/3.0_a20-1-11-g413bda3

Daniel Baumann daniel at debian.org
Thu Sep 8 19:09:56 UTC 2011


The following commit has been merged in the debian branch:
commit 7ad53e42ddb949898e5ce30d0e158424f781aeaa
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 8 16:21:19 2011 +0200

    Using /usr/share/live-boot instead of unreliable /usr/share/doc/live-boot in validateroot bootscript, stripped live systems may or may not carry /usr/share/doc.

diff --git a/scripts/live-bottom/10validateroot b/scripts/live-bottom/10validateroot
index 23eb900..d4d1620 100755
--- a/scripts/live-bottom/10validateroot
+++ b/scripts/live-bottom/10validateroot
@@ -7,7 +7,7 @@
 # initramfs-tools header
 
 PREREQ=""
- 
+
 prereqs()
 {
 	echo "${PREREQ}"
@@ -23,7 +23,7 @@ esac
 . /scripts/live-functions
 . /scripts/live-helpers
 
-if ! [ -d "/root/usr/share/doc/live-boot" ]
+if ! [ -d "/root/usr/share/live-boot" ]
 then
 	panic "A wrong rootfs was mounted."
 fi

-- 
live-boot



More information about the debian-live-changes mailing list