Removing remaining leftovers from etch-only options --genisoimage and --union-filesystem removals (Closes: #568261).

This commit is contained in:
Daniel Baumann 2010-02-14 16:06:41 +01:00
parent 19e9cf8331
commit 3d76871254
2 changed files with 2 additions and 17 deletions

View File

@ -69,7 +69,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [-e|--encryption false|aes128|aes192|aes256]\n\ \t [-e|--encryption false|aes128|aes192|aes256]\n\
\t [--fdisk fdisk|fdisk.dist]\n\ \t [--fdisk fdisk|fdisk.dist]\n\
\t [--force]\n\ \t [--force]\n\
\t [--genisoimage genisomage|mkisofs]\n\
\t [--grub-splash FILE]\n\ \t [--grub-splash FILE]\n\
\t [--gzip-options OPTION|\"OPTIONS\"]\n\ \t [--gzip-options OPTION|\"OPTIONS\"]\n\
\t [--hooks FILE]\n\ \t [--hooks FILE]\n\
@ -121,7 +120,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--tasksel aptitude|tasksel]\n\ \t [--tasksel aptitude|tasksel]\n\
\t [--tasks TASK]\n\ \t [--tasks TASK]\n\
\t [--templates PATH]\n\ \t [--templates PATH]\n\
\t [--union-filesystem aufs|unionfs]\n\
\t [--virtual-root-size MB]\n\ \t [--virtual-root-size MB]\n\
\t [--exposed-root true|false]\n\ \t [--exposed-root true|false]\n\
\t [--username NAME]\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:, 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:, 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:, initramfs:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:,
templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean, templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:, 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:, gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-filesystem:,binary-images:, packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:, binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:,
@ -428,11 +426,6 @@ Local_arguments ()
shift 2 shift 2
;; ;;
--union-filesystem)
LH_UNION_FILESYSTEM="${2}"
shift 2
;;
--virtual-root-size) --virtual-root-size)
LH_VIRTUAL_ROOT_SIZE="${2}" LH_VIRTUAL_ROOT_SIZE="${2}"
shift 2 shift 2

View File

@ -85,8 +85,6 @@ lh_config \- create configuration for live\-helper
[\-e|\fB\-\-encryption\fR false|aes128|aes192|aes256] [\-e|\fB\-\-encryption\fR false|aes128|aes192|aes256]
.br .br
[\fB\-\-fdisk\fR fdisk|fdisk.dist] [\fB\-\-fdisk\fR fdisk|fdisk.dist]
.br
[\fB\-\-genisoimage\fR genisomage|mkisofs]
.br .br
[\fB\-\-grub\-splash\fR \fIFILE\fR] [\fB\-\-grub\-splash\fR \fIFILE\fR]
.br .br
@ -187,8 +185,6 @@ lh_config \- create configuration for live\-helper
[\fB\-\-tasks\fR \fITASK\fR|"\fITASKS\fR"] [\fB\-\-tasks\fR \fITASK\fR|"\fITASKS\fR"]
.br .br
[\fB\-\-templates\fR \fIPATH\fR] [\fB\-\-templates\fR \fIPATH\fR]
.br
[\fB\-\-union\-filesystem\fR aufs|unionfs]
.br .br
[\fB\-\-virtual\-root\-filesystem\fR ext3] [\fB\-\-virtual\-root\-filesystem\fR ext3]
.br .br
@ -290,8 +286,6 @@ prepares a report of the currently present live system configuration and the ver
defines if the root filesystem should be encrypted or not. By default, this is false. defines if the root filesystem should be encrypted or not. By default, this is false.
.IP "\fB\-\-fdisk\fR fdisk|fdisk.dist" 4 .IP "\fB\-\-fdisk\fR fdisk|fdisk.dist" 4
sets the filename of the fdisk binary from the host system that should be used. This is autodetected and does generally not need any customization. sets the filename of the fdisk binary from the host system that should be used. This is autodetected and does generally not need any customization.
.IP "\fB\-\-genisoimage\fR genisomage|mkisofs" 4
sets the filename of the genisoimage binary from the host system that should be used. This is autodetected and does generally not need any customization.
.IP "\fB\-\-grub\-splash\fR \fIFILE\fR" 4 .IP "\fB\-\-grub\-splash\fR \fIFILE\fR" 4
defines the name of an optional to be included splash screen graphic for the grub bootloader. defines the name of an optional to be included splash screen graphic for the grub bootloader.
.IP "\fB\-\-gzip\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4 .IP "\fB\-\-gzip\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4
@ -399,8 +393,6 @@ selects which program is used to install tasks. By default, this is set to tasks
defines one or more package tasks to be installed in the live system. This is a quick and convenient way to get a reasonable default selection of packages suitable for most users when building an image, but it results in quite big images. If you want to have finer grained package selections, local packages lists should be used instead. defines one or more package tasks to be installed in the live system. This is a quick and convenient way to get a reasonable default selection of packages suitable for most users when building an image, but it results in quite big images. If you want to have finer grained package selections, local packages lists should be used instead.
.IP "\fB\-\-templates\fR \fIPATH\fR" 4 .IP "\fB\-\-templates\fR \fIPATH\fR" 4
sets the path to the templates that live\-helper is going to use, e.g. for bootloaders. By default, this is set to /usr/share/live-helper/templates/. sets the path to the templates that live\-helper is going to use, e.g. for bootloaders. By default, this is set to /usr/share/live-helper/templates/.
.IP "\fB\-\-union\-filesystem\fR aufs|unionfs" 4
defines whetever to use UnionFS or Aufs as stackable unification filesystem. When building etch images, this defaults to unionfs, everywhere else to aufs.
.IP "\fB\-\-virtual\-root\-filesystem\fR ext3" 4 .IP "\fB\-\-virtual\-root\-filesystem\fR ext3" 4
defines what filesystem to format the root filesystem when building virtual-hdd images. defines what filesystem to format the root filesystem when building virtual-hdd images.
.IP "\fB\-\-virtual\-root\-size\fR MB" 4 .IP "\fB\-\-virtual\-root\-size\fR MB" 4