[SCM] live-helper branch, debian-next, updated. debian/2.0_a6-1-11-g101ad7f

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 101ad7fa2d7adc8cfe410ce19f374d44b6b245af
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Feb 14 16:06:41 2010 +0100

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

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
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index a38d368..a6e2383 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -86,8 +86,6 @@ lh_config \- create configuration for live\-helper
 .br
 	[\fB\-\-fdisk\fR fdisk|fdisk.dist]
 .br
-	[\fB\-\-genisoimage\fR genisomage|mkisofs]
-.br
 	[\fB\-\-grub\-splash\fR \fIFILE\fR]
 .br
 	[\fB\-\-gzip\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"]
@@ -188,8 +186,6 @@ lh_config \- create configuration for live\-helper
 .br
 	[\fB\-\-templates\fR \fIPATH\fR]
 .br
-	[\fB\-\-union\-filesystem\fR aufs|unionfs]
-.br
 	[\fB\-\-virtual\-root\-filesystem\fR ext3]
 .br
 	[\fB\-\-virtual\-root\-size \fIMB\fR]
@@ -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.
 .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.
-.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
 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
@@ -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.
 .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/.
-.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
 defines what filesystem to format the root filesystem when building virtual-hdd images.
 .IP "\fB\-\-virtual\-root\-size\fR MB" 4

-- 
live-helper