summaryrefslogtreecommitdiff
path: root/scripts/build/lb_config
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-11-21 17:17:48 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:20:35 +0100
commitda2c2b0bcc775451d10d7dab9b0cbe2f604c6d25 (patch)
treef3b6e56fdb490a02b75d287d5954fa3b375b95ed /scripts/build/lb_config
parentad7824af8dec8d7f3591fdf269b8402671357184 (diff)
downloadvyos-live-build-da2c2b0bcc775451d10d7dab9b0cbe2f604c6d25.tar.gz
vyos-live-build-da2c2b0bcc775451d10d7dab9b0cbe2f604c6d25.zip
Renaming --binary-indices to --apt-indices for consistency.
Diffstat (limited to 'scripts/build/lb_config')
-rwxr-xr-xscripts/build/lb_config20
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 6305f46b8..f3d0b81e7 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -31,6 +31,7 @@ DESCRIPTION="$(Echo 'create configuration for live-build(7)')"
USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--apt-ftp-proxy URL]\n\
\t [--apt-http-proxy URL]\n\
+\t [--apt-indices true|false|none]\n\
\t [--apt-pdiffs true|false]\n\
\t [--apt-options OPTION|\"OPTIONS\"]\n\
\t [--aptitude-options OPTION|\"OPTIONS\"]\n\
@@ -40,7 +41,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [-a|--architecture ARCHITECTURE]\n\
\t [-b|--binary-images iso|net|tar|usb-hdd]\n\
\t [--binary-filesystem fat16|fat32]\n\
-\t [--binary-indices true|false|none]\n\
\t [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
\t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
\t [--bootloader grub|syslinux|yaboot]\n\
@@ -145,7 +145,7 @@ Local_arguments ()
mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
packages:,packages-lists:,tasks:,security:,volatile:,backports:,sysvinit:,binary-filesystem:,binary-images:,
- binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,build-with-chroot:,
+ apt-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,build-with-chroot:,
debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
encryption:,grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:,
iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,
@@ -225,6 +225,11 @@ Local_arguments ()
shift 2
;;
+ --apt-indices)
+ LB_APT_INDICES="${2}"
+ shift 2
+ ;;
+
--apt-pdiffs)
LB_APT_PDIFFS="${2}"
shift 2
@@ -535,11 +540,6 @@ Local_arguments ()
shift 2
;;
- --binary-indices)
- LB_BINARY_INDICES="${2}"
- shift 2
- ;;
-
--bootappend-live)
LB_BOOTAPPEND_LIVE="${2}"
shift 2
@@ -1132,9 +1132,9 @@ LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM}"
# (Default: ${LB_BINARY_IMAGES})
LB_BINARY_IMAGES="${LB_BINARY_IMAGES}"
-# \$LB_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: ${LB_BINARY_INDICES})
-LB_BINARY_INDICES="${LB_BINARY_INDICES}"
+# \$LB_APT_INDICES: set apt/aptitude generic indices
+# (Default: ${LB_APT_INDICES})
+LB_APT_INDICES="${LB_APT_INDICES}"
# \$LB_BOOTAPPEND_LIVE: set boot parameters
# (Default: empty)