[SCM] debian-live branch, master, updated. 1.0_a48-1-69-gfc1fbfa
Chris Lamb
chris at chris-lamb.co.uk
Tue Aug 12 21:39:11 UTC 2008
The following commit has been merged in the master branch:
commit 2464f0d0806a5fba6a24419957a1d60610a6620d
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Tue Aug 12 22:26:38 2008 +0100
Rename internal LH_BOOTAPPEND_PRESEED variable to _LH_BOOTAPPEND_PRESEED
diff --git a/functions/defaults.sh b/functions/defaults.sh
index a13de1b..7a7777f 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -557,30 +557,30 @@ Set_defaults ()
then
case "${LH_BINARY_IMAGES}" in
iso)
- LH_BOOTAPPEND_PRESEED="file=/cdrom/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
+ _LH_BOOTAPPEND_PRESEED="file=/cdrom/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
;;
usb-hdd)
- LH_BOOTAPPEND_PRESEED="file=/hd-media/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
+ _LH_BOOTAPPEND_PRESEED="file=/hd-media/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
;;
net)
case "${LH_DEBIAN_INSTALLER_PRESEEDFILE}" in
*://*)
- LH_BOOTAPPEND_PRESEED="file=${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
+ _LH_BOOTAPPEND_PRESEED="file=${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
;;
*)
- LH_BOOTAPPEND_PRESEED="file=/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
+ _LH_BOOTAPPEND_PRESEED="file=/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
;;
esac
;;
esac
fi
- if [ -z "${LH_BOOTAPPEND_INSTALL}" ] && [ -n ${LH_BOOTAPPEND_PRESEED} ]
+ if [ -z "${LH_BOOTAPPEND_INSTALL}" ] && [ -n ${_LH_BOOTAPPEND_PRESEED} ]
then
- LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_PRESEED} -- \${LH_BOOTAPPEND_LIVE}"
+ LH_BOOTAPPEND_INSTALL="${_LH_BOOTAPPEND_PRESEED} -- \${LH_BOOTAPPEND_LIVE}"
else
LH_BOOTAPPEND_INSTALL="-- \${LH_BOOTAPPEND_LIVE}"
fi
--
debian-live
More information about the debian-live-changes
mailing list