From 59e0b310a3fd3555c919baca7ef3a24a1973f5e7 Mon Sep 17 00:00:00 2001
From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sat, 16 Aug 2008 11:30:48 +0100
Subject: Correct logic in LH_BOOTAPPEND_INSTALL handling
(LH_BOOTAPPEND_INSTALL was being overridden if a preseed.cfg was found.)
---
functions/defaults.sh | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index a2db35d..3a3b423 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -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
--
cgit v1.0