diff options
| author | Cody A.W. Somerville <cody.somerville@canonical.com> | 2009-09-02 07:39:13 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:46 +0100 |
| commit | 27be06512a9fcfbc68ad4f04efa13aa34e43bd2d (patch) | |
| tree | 6ae4fa6caf9783eaea683b7c9f5df947cf0b1495 /helpers | |
| parent | a55187778e01050f348532995eb9618897d96908 (diff) | |
| download | vyos-live-build-27be06512a9fcfbc68ad4f04efa13aa34e43bd2d.tar.gz vyos-live-build-27be06512a9fcfbc68ad4f04efa13aa34e43bd2d.zip | |
Add option to disable use of GTK debian-installer.
Adding the ability to disable use of the GTK graphical
debian-installer is handy either to reduce the size of the
images or if the necessary files aren't available.
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 25 | ||||
| -rwxr-xr-x | helpers/lh_config | 12 |
2 files changed, 25 insertions, 12 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 66a8bde9d..32d0ce040 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -320,18 +320,21 @@ else # Downloading graphical-installer DOWNLOAD_GTK_INSTALLER=0 - case "${LH_ARCHITECTURE}" in - amd64|i386|lpia) - DOWNLOAD_GTK_INSTALLER=1 - ;; - - powerpc) - if [ "${LH_DEBIAN_INSTALLER}" = "netboot" ] - then + if [ "${LH_DEBIAN_INSTALLER_GUI}" = "enabled" ] + then + case "${LH_ARCHITECTURE}" in + amd64|i386|lpia) DOWNLOAD_GTK_INSTALLER=1 - fi - ;; - esac + ;; + + powerpc) + if [ "${LH_DEBIAN_INSTALLER}" = "netboot" ] + then + DOWNLOAD_GTK_INSTALLER=1 + fi + ;; + esac + fi if [ ${DOWNLOAD_GTK_INSTALLER} -eq 1 ] then diff --git a/helpers/lh_config b/helpers/lh_config index 6bd36281e..57a8b9e82 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -62,6 +62,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled]\n\ \t [--debian-installer-distribution CODENAME|daily]\n\ \t [--debian-installer-preseedfile FILE|URL]\n\ +\t [--debian-installer-gui enabled|disabled]\n\ \t [--debug]\n\ \t [-d|--distribution CODENAME]\n\ \t [--dump]\n\ @@ -138,7 +139,7 @@ Local_arguments () hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:, packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-filesystem:,binary-images:, binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:, - debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:, + debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:, encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:, iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:, net-root-path:,net-root-server:,net-cow-filesystem:,net-cow-mountoptions:,net-cow-path:, @@ -544,6 +545,11 @@ Local_arguments () shift 2 ;; + --debian-installer-gui) + LH_DEBIAN_INSTALLER_GUI="${2}" + shift 2 + ;; + -e|--encryption) LH_ENCRYPTION="${2}" shift 2 @@ -1095,6 +1101,10 @@ LH_DEBIAN_INSTALLER_DISTRIBUTION="${LH_DEBIAN_INSTALLER_DISTRIBUTION}" # (Default: ${LH_DEBIAN_INSTALLER_PRESEEDFILE}) LH_DEBIAN_INSTALLER_PRESEEDFILE="${LH_DEBIAN_INSTALLER_PRESEEDFILE}" +# \$LH_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer +# (Default: ${LH_DEBIAN_INSTALLER_GUI}) +LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI}" + # \$LH_ENCRYPTION: set encryption # (Default: ${LH_ENCRYPTION}) LH_ENCRYPTION="${LH_ENCRYPTION}" |