r2716 - in dists/trunk/live-helper: docs functions helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-07 18:54:43 +0000 (Tue, 07 Aug 2007)
New Revision: 2716

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/functions/defaults.sh
   dists/trunk/live-helper/helpers/lh_config
Log:
Adding auto mode for LH_INITRAMFS.

Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-08-06 16:17:09 UTC (rev 2715)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-08-07 18:54:43 UTC (rev 2716)
@@ -1,6 +1,11 @@
+2007-08-07  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh:
+	  - Added auto mode for LH_INITRAMFS.
+
 2007-08-05  Daniel Baumann  <daniel at debian.org>
 
-	* functions/defaults:
+	* functions/defaults.sh:
 	  - Added debian-edu mode.
 	* lists/knoppix, knoppix-dvd:
 	  - Added.

Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-08-06 16:17:09 UTC (rev 2715)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-08-07 18:54:43 UTC (rev 2716)
@@ -167,24 +167,29 @@
 	# Setting initramfs hook
 	if [ -z "${LH_INITRAMFS}" ]
 	then
-		case "${LH_MODE}" in
-			debian)
-				if [ "${LH_DISTRIBUTION}" = "etch" ]
-				then
-					LH_INITRAMFS="casper"
-				else
+		LH_INITRAMFS="auto"
+	else
+		if [ "${LH_INITRAMFS}" = "auto" ]
+		then
+			case "${LH_MODE}" in
+				debian)
+					if [ "${LH_DISTRIBUTION}" = "etch" ]
+					then
+						LH_INITRAMFS="casper"
+					else
+						LH_INITRAMFS="live-initramfs"
+					fi
+					;;
+
+				debian-edu)
 					LH_INITRAMFS="live-initramfs"
-				fi
-				;;
+					;;
 
-			debian-edu)
-				LH_INITRAMFS="live-initramfs"
-				;;
-
-			ubuntu)
-				LH_INITRAMFS="live-initramfs"
-				;;
-		esac
+				ubuntu)
+					LH_INITRAMFS="live-initramfs"
+					;;
+			esac
+		fi
 	fi
 
 	# Setting losetup

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-08-06 16:17:09 UTC (rev 2715)
+++ dists/trunk/live-helper/helpers/lh_config	2007-08-07 18:54:43 UTC (rev 2716)
@@ -20,7 +20,7 @@
 # Setting static variables
 DESCRIPTION="create configuration for live-helper(7)"
 HELP="FIXME"
-USAGE="${PROGRAM} [--apt apt|aptitude] [--apt-ftp-proxy URL] [--apt-http-proxy URL] [--apt-pdiffs enabled|disabled] [--apt-pipeline FIXME] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|debootstrap] [--cache enabled|disabled] [--cache-indices enabled|disabled] [--cache-packages enabled|disabled] [--cache-stages STAGE|\"STAGES\"] [--debconf-frontend FIXME] [--debconf-nowarnings enabled|disabled] [--debconf-priority FIXME] [--genisoimage genisomage|mkisofs] [--initramfs live-initramfs|casper] [--losetup losetup|losetup.orig] [--mode debian|debian-edu|ubuntu] [--root-command sudo] [--tasksel aptitude|tasksel] [--includes PATH] [--templates PATH] [-a|--architecture ARCHITECTURE] [--bootstrap-config FILE] [-f|--bootstrap-flavour standard|minimal] [--bootstrap-keyring PACKAGE] [-d|--distribution CODENAME] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--chroot-filesystem ext2|ext3|squashfs|plain] [--union-filesystem unionfs|aufs] [--hooks FILE] [--interactive shell] [--keyring-packages PACKAGE|\"PACKAGES\"] [-l|--language LANGUAGE] [-k|--linux-flavours FLAVOUR|\"FLAVOURS\"] [--linux-packages \"PACKAGES\"] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists FILE] [--tasks TASK] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [-b|--binary-images iso|usb-hdd|net|tar] [--binary-indices enabled|disabled] [--bootappend PARAMETER|\"PARAMETERS\"] [--bootloader syslinux|grub|yaboot] [--chroot-build enabled|disabled] [--debian-installer enabled|disabled] [-e|--encryption aes128|aes192|aes256] [--grub-splash FILE] [--hostname NAME] [--iso-application NAME] [--iso-preparer NAME] [--iso-publisher NAME] [--iso-volume NAME] [---memtest memtest86+|memtest86] [--net-filesystem nfs|cfs] [--net-mountoptions OPTIONS] [--net-path PATH] [--net-server IP|HOSTNAME] [--syslinux-splash FILE] [--username NAME] [--source enabled|disabled] [-s|--source-images iso|usb-hdd|net|tar]"
+USAGE="${PROGRAM} [--apt apt|aptitude] [--apt-ftp-proxy URL] [--apt-http-proxy URL] [--apt-pdiffs enabled|disabled] [--apt-pipeline FIXME] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|debootstrap] [--cache enabled|disabled] [--cache-indices enabled|disabled] [--cache-packages enabled|disabled] [--cache-stages STAGE|\"STAGES\"] [--debconf-frontend FIXME] [--debconf-nowarnings enabled|disabled] [--debconf-priority FIXME] [--genisoimage genisomage|mkisofs] [--initramfs auto|live-initramfs|casper] [--losetup losetup|losetup.orig] [--mode debian|debian-edu|ubuntu] [--root-command sudo] [--tasksel aptitude|tasksel] [--includes PATH] [--templates PATH] [-a|--architecture ARCHITECTURE] [--bootstrap-config FILE] [-f|--bootstrap-flavour standard|minimal] [--bootstrap-keyring PACKAGE] [-d|--distribution CODENAME] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--chroot-filesystem ext2|ext3|squashfs|plain] [--union-filesystem unionfs|aufs] [--hooks FILE] [--interactive shell] [--keyring-packages PACKAGE|\"PACKAGES\"] [-l|--language LANGUAGE] [-k|--linux-flavours FLAVOUR|\"FLAVOURS\"] [--linux-packages \"PACKAGES\"] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists FILE] [--tasks TASK] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [-b|--binary-images iso|usb-hdd|net|tar] [--binary-indices enabled|disabled] [--bootappend PARAMETER|\"PARAMETERS\"] [--bootloader syslinux|grub|yaboot] [--chroot-build enabled|disabled] [--debian-installer enabled|disabled] [-e|--encryption aes128|aes192|aes256] [--grub-splash FILE] [--hostname NAME] [--iso-application NAME] [--iso-preparer NAME] [--iso-publisher NAME] [--iso-volume NAME] [---memtest memtest86+|memtest86] [--net-filesystem nfs|cfs] [--net-mountoptions OPTIONS] [--net-path PATH] [--net-server IP|HOSTNAME] [--syslinux-splash FILE] [--username NAME] [--source enabled|disabled] [-s|--source-images iso|usb-hdd|net|tar]"
 
 Local_arguments ()
 {