From a3a132a315362c2a88229abd9740633009c4fe43 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 14:05:13 +0200
Subject: Passing live bootappends to debian-installer.
---
functions/defaults.sh | 2 +-
helpers/lh_config | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 9ae43e4..8557226 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -615,8 +615,8 @@ Set_defaults ()
LH_BINARY_INDICES="${LH_BINARY_INDICES:-enabled}"
# Setting boot parameters
- LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL:---}"
# LH_BOOTAPPEND_LIVE
+ LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL:--- \${LH_BOOTAPPEND_LIVE}}"
# Setting bootloader
if [ -z "${LH_BOOTLOADER}" ]
diff --git a/helpers/lh_config b/helpers/lh_config
index 2a6e28f..9c9d11b 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -393,13 +393,13 @@ Local_arguments ()
shift 2
;;
- --bootappend-install)
- LH_BOOTAPPEND_INSTALL="${2}"
+ --bootappend-live)
+ LH_BOOTAPPEND_LIVE="${2}"
shift 2
;;
- --bootappend-live)
- LH_BOOTAPPEND_LIVE="${2}"
+ --bootappend-install)
+ LH_BOOTAPPEND_INSTALL="${2}"
shift 2
;;
@@ -842,14 +842,14 @@ LH_BINARY_IMAGES="${LH_BINARY_IMAGES}"
# (Default: ${LH_BINARY_INDICES})
LH_BINARY_INDICES="${LH_BINARY_INDICES}"
-# \$LH_BOOTAPPEND_INSTALL: set boot parameters
-# (Default: empty)
-LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL}"
-
# \$LH_BOOTAPPEND_LIVE: set boot parameters
# (Default: empty)
LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE}"
+# \$LH_BOOTAPPEND_INSTALL: set boot parameters
+# (Default: empty)
+LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL}"
+
# \$LH_BOOTLOADER: set bootloader
# (Default: ${LH_BOOTLOADER})
LH_BOOTLOADER="${LH_BOOTLOADER}"
--
cgit v1.0