[SCM] live-config branch, debian, updated. debian/3.0_a36-1

Daniel Baumann daniel at debian.org
Fri Apr 6 08:14:45 UTC 2012


The following commit has been merged in the debian branch:
commit 8d83535676cf507d70a164f43dff1614166d7beb
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Apr 6 09:45:52 2012 +0200

    Replacing type with which in order to check for archdetect in boot initscript, using type is a possible bashism.

diff --git a/bin/boot-init.sh b/bin/boot-init.sh
index a61499c..5599818 100755
--- a/bin/boot-init.sh
+++ b/bin/boot-init.sh
@@ -114,7 +114,7 @@ fi
 # as a quasi-boot-floppy. Technically this uses a bit of ubiquity
 # (archdetect), but since this is mostly only relevant for
 # installations, who cares ...
-if type archdetect >/dev/null 2>&1
+if [ -x "$(which archdetect 2>/dev/null)" ]
 then
 	subarch="$(archdetect)"
 

-- 
live-config



More information about the debian-live-changes mailing list