manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing LH_BOOTAPPEND_INSTALL issues for Ubuntu based builds.

This commit is contained in:
Cody A.W. Somerville 2009-05-27 18:08:35 +02:00 committed by Daniel Baumann
parent cfc81e5622
commit 0fef6abce8
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
functions/defaults.sh
View File

@ -767,7 +767,12 @@ Set_defaults ()
;;
usb-hdd)
_LH_BOOTAPPEND_PRESEED="file=/hd-media/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
if [ "${LH_MODE}" = "ubuntu" ]
then
_LH_BOOTAPPEND_PRESEED="file=/cdrom/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
else
_LH_BOOTAPPEND_PRESEED="file=/hd-media/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
fi
;;
net)
@ -786,19 +791,19 @@ Set_defaults ()
if [ -z "${LH_BOOTAPPEND_INSTALL}" ]
then
# Ubuntu's d-i is patched to be able to use usb-hdd block devices for
# install media if enabled by preseeding cdrom-detect/try-usb to true.
if [ "${LH_MODE}" = "ubuntu" ] && [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]
then
LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true"
fi
if [ -n ${_LH_BOOTAPPEND_PRESEED} ]
then
LH_BOOTAPPEND_INSTALL="${_LH_BOOTAPPEND_PRESEED} -- \${LH_BOOTAPPEND_LIVE}"
else
LH_BOOTAPPEND_INSTALL=" -- \${LH_BOOTAPPEND_LIVE}"
LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL} ${_LH_BOOTAPPEND_PRESEED}"
fi
fi
# Ubuntu's d-i is patched to be able to use usb-hdd block devices for
# install media if enabled by preseeding cdrom-detect/try-usb to true.
if [ "${LH_MODE}" = "ubuntu" ] && [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]
then
LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true -- \${LH_BOOTAPPEND_LIVE}"
LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL} -- \${LH_BOOTAPPEND_LIVE}"
fi
# Setting encryption