Correct logic in LH_BOOTAPPEND_INSTALL handling
(LH_BOOTAPPEND_INSTALL was being overridden if a preseed.cfg was found.)
This commit is contained in:
parent
0a5065a817
commit
e11175ed2c
|
@ -578,11 +578,14 @@ Set_defaults ()
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "${LH_BOOTAPPEND_INSTALL}" ] && [ -n ${_LH_BOOTAPPEND_PRESEED} ]
|
if [ -z "${LH_BOOTAPPEND_INSTALL}" ]
|
||||||
then
|
then
|
||||||
LH_BOOTAPPEND_INSTALL="${_LH_BOOTAPPEND_PRESEED} -- \${LH_BOOTAPPEND_LIVE}"
|
if [ -n ${_LH_BOOTAPPEND_PRESEED} ]
|
||||||
else
|
then
|
||||||
LH_BOOTAPPEND_INSTALL=" -- \${LH_BOOTAPPEND_LIVE}"
|
LH_BOOTAPPEND_INSTALL="${_LH_BOOTAPPEND_PRESEED} -- \${LH_BOOTAPPEND_LIVE}"
|
||||||
|
else
|
||||||
|
LH_BOOTAPPEND_INSTALL=" -- \${LH_BOOTAPPEND_LIVE}"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Setting encryption
|
# Setting encryption
|
||||||
|
|
Loading…
Reference in New Issue