summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-02-14 16:06:41 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:04 +0100
commit3d76871254d170cc4e9f0fcc6a4f115f8f875c1d (patch)
tree6215c02dc87df65c0ea59b429584a56967e102e3 /helpers
parent19e9cf8331ff19dadb412841f971ece5c6e52d79 (diff)
downloadlive-build-3d76871254d170cc4e9f0fcc6a4f115f8f875c1d.zip
live-build-3d76871254d170cc4e9f0fcc6a4f115f8f875c1d.tar.gz
Removing remaining leftovers from etch-only options --genisoimage and --union-filesystem removals (Closes: #568261).
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/config11
1 files changed, 2 insertions, 9 deletions
diff --git a/helpers/config b/helpers/config
index 83a8242..2d7903c 100755
--- a/helpers/config
+++ b/helpers/config
@@ -69,7 +69,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [-e|--encryption false|aes128|aes192|aes256]\n\
\t [--fdisk fdisk|fdisk.dist]\n\
\t [--force]\n\
-\t [--genisoimage genisomage|mkisofs]\n\
\t [--grub-splash FILE]\n\
\t [--gzip-options OPTION|\"OPTIONS\"]\n\
\t [--hooks FILE]\n\
@@ -121,7 +120,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--tasksel aptitude|tasksel]\n\
\t [--tasks TASK]\n\
\t [--templates PATH]\n\
-\t [--union-filesystem aufs|unionfs]\n\
\t [--virtual-root-size MB]\n\
\t [--exposed-root true|false]\n\
\t [--username NAME]\n\
@@ -132,11 +130,11 @@ Local_arguments ()
{
LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-options:,aptitute-options:,
apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,
- cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,genisoimage:,
+ cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
initramfs:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:,
templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:,
- mirror-binary-security:,archive-areas:,chroot-filesystem:,union-filesystem:,exposed-root:,virtual-root-size:,
+ mirror-binary-security:,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:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:,
@@ -428,11 +426,6 @@ Local_arguments ()
shift 2
;;
- --union-filesystem)
- LH_UNION_FILESYSTEM="${2}"
- shift 2
- ;;
-
--virtual-root-size)
LH_VIRTUAL_ROOT_SIZE="${2}"
shift 2