Correct logic in LH_BOOTAPPEND_INSTALL handling

(LH_BOOTAPPEND_INSTALL was being overridden if a preseed.cfg was found.)
This commit is contained in:
Chris Lamb 2008-08-16 11:30:48 +01:00
parent 0a5065a817
commit e11175ed2c
1 changed files with 7 additions and 4 deletions

View File

@ -578,11 +578,14 @@ Set_defaults ()
esac
fi
if [ -z "${LH_BOOTAPPEND_INSTALL}" ] && [ -n ${_LH_BOOTAPPEND_PRESEED} ]
if [ -z "${LH_BOOTAPPEND_INSTALL}" ]
then
LH_BOOTAPPEND_INSTALL="${_LH_BOOTAPPEND_PRESEED} -- \${LH_BOOTAPPEND_LIVE}"
else
LH_BOOTAPPEND_INSTALL=" -- \${LH_BOOTAPPEND_LIVE}"
if [ -n ${_LH_BOOTAPPEND_PRESEED} ]
then
LH_BOOTAPPEND_INSTALL="${_LH_BOOTAPPEND_PRESEED} -- \${LH_BOOTAPPEND_LIVE}"
else
LH_BOOTAPPEND_INSTALL=" -- \${LH_BOOTAPPEND_LIVE}"
fi
fi
# Setting encryption