diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 14:05:13 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:26 +0100 |
| commit | a3a132a315362c2a88229abd9740633009c4fe43 (patch) | |
| tree | 1e248f915830abef9633a5b5869b574c96249d1b | |
| parent | a63876a8d71f5497d8449704f377ba38a0b5e457 (diff) | |
| download | live-build-a3a132a315362c2a88229abd9740633009c4fe43.zip live-build-a3a132a315362c2a88229abd9740633009c4fe43.tar.gz | |
Passing live bootappends to debian-installer.
| -rwxr-xr-x | functions/defaults.sh | 2 | ||||
| -rwxr-xr-x | 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}" |