[SCM] debian-live/live-helper branch, master, updated. 1.0_a28-1-2-g5d74f29

[Daniel Baumann]

The branch, master has been updated
       via  5d74f2962d8100bbf6b4b2256fcdbecf7f023379 (commit)
      from  9419843fb65eeaa2995912458ebc0a18b43aa097 (commit)


- Shortlog ------------------------------------------------------------
5d74f29 functions/defaults.sh

Summary of changes:
 functions/defaults.sh |    2 +-
 helpers/lh_config     |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 5d74f2962d8100bbf6b4b2256fcdbecf7f023379
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Sep 17 12:41:22 2007 +0200

    functions/defaults.sh
    helpers/lh_config
    
      * Passing live bootappends to debian-installer.

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}"

-- 
debian-live/live-helper