r2717 - in dists/trunk/live-helper: functions helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Tue Aug 7 19:43:50 UTC 2007
Author: daniel
Date: 2007-08-07 19:43:50 +0000 (Tue, 07 Aug 2007)
New Revision: 2717
Modified:
dists/trunk/live-helper/functions/arguments.sh
dists/trunk/live-helper/helpers/lh_config
Log:
Modified: dists/trunk/live-helper/functions/arguments.sh
===================================================================
--- dists/trunk/live-helper/functions/arguments.sh 2007-08-07 18:54:43 UTC (rev 2716)
+++ dists/trunk/live-helper/functions/arguments.sh 2007-08-07 19:43:50 UTC (rev 2717)
@@ -11,7 +11,7 @@
Arguments ()
{
- ARGUMENTS="`getopt --longoptions breakpoints,conffile:,debug,force,help,logfile:,trace,root-command:,quiet,usage,verbose,version --name=${PROGRAM} --options huv --shell sh -- "${@}"`"
+ ARGUMENTS="`getopt --longoptions breakpoints,conffile:,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options c:huv --shell sh -- "${@}"`"
if [ "${?}" != "0" ]
then
@@ -29,7 +29,7 @@
shift
;;
- --conffile)
+ -c|-conffile)
LH_CONFFILE="${2}"
shift 2
;;
@@ -49,21 +49,6 @@
shift
;;
- --logfile)
- LH_LOGFILE="${2}"
- shift 2
- ;;
-
- --trace)
- LH_TRACE="enabled"
- shift
- ;;
-
- --root-command)
- LH_ROOT_COMMAND="${2}"
- shift
- ;;
-
--quiet)
LH_QUIET="enabled"
shift
Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config 2007-08-07 18:54:43 UTC (rev 2716)
+++ dists/trunk/live-helper/helpers/lh_config 2007-08-07 19:43:50 UTC (rev 2717)
@@ -20,11 +20,11 @@
# 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 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]"
+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] [-a|--architecture ARCHITECTURE] [-b|--binary-images iso|net|tar|usb-hdd] [--binary-indices enabled|disabled] [--bootappend PARAMETER|\"PARAMETERS\"] [--bootloader grub|syslinux|yaboot] [--bootstrap cdebootstrap|debootstrap] [--bootstrap-config FILE] [-f|--bootstrap-flavour minimal|standard] [--bootstrap-keyring PACKAGE] [--breakpoints] [--cache enabled|disabled] [--cache-indices enabled|disabled] [--cache-packages enabled|disabled] [--cache-stages STAGE|\"STAGES\"] [--chroot-build enabled|disabled] [--chroot-filesystem ext2|ext3|squashfs|plain] [-c|--conffile FILE] [--debconf-frontend dialog|editor|noninteractive|readline] [--debconf-nowarnings enabled|disabled] [--debconf-priority low|medium|high|critical] [--debian-installer enabled|disabled] [--debug] [-d|--distribution CODENAME] [-e|--encryption aes128|aes192|aes256] [--force] [--genisoimage genisomage|mkisofs] [--grub-splash FILE] [--hooks FILE] [--hostname NAME] [--includes PATH] [--initramfs auto|live-initramfs|casper] [--interactive shell] [--iso-application NAME] [--iso-preparer NAME] [--iso-publisher NAME] [--iso-volume NAME] [--keyring-packages PACKAGE|\"PACKAGES\"] [-l|--language LANGUAGE] [-k|--linux-flavours FLAVOUR|\"FLAVOURS\"] [--linux-packages \"PACKAGES\"] [--losetup losetup|losetup.orig] [--memtest memtest86+|memtest86] [-m|--mirror-binary-security URL] [--mirror-binary URL] [--mirror-bootstrap-security URL] [--mirror-bootstrap URL] [--mode debian|debian-edu|ubuntu] [--net-filesystem nfs|cfs] [--net-mountoptions OPTIONS] [--net-path PATH] [--net-server IP|HOSTNAME] [-p|--packages-lists FILE] [--packages PACKAGE|\"PACKAGES\"] [--quiet] [--root-command sudo] [--sections SECTION|\"SECTIONS\"] [--security enabled|disabled] [--source enabled|disabled] [-s|--source-images iso|net|tar|usb-hdd]" [--symlinks enabled|disabled] [--syslinux-splash FILE] [--sysvinit enabled|disabled] [--tasksel aptitude|tasksel] [--tasks TASK] [--templates PATH] [--union-filesystem aufs|unionfs] [--username NAME] [--verbose]"
Local_arguments ()
{
- ARGUMENTS="`getopt --longoptions apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,genisoimage:,initramfs:,losetup:,mode:,root-command:,tasksel:,includes:,templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,distribution:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,chroot-filesystem:,union-filesystem:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-images:,binary-indices:,bootappend:,bootloader:,chroot-build:,debian-installer:,encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,iso-memtest:,net-filesystem:,net-mountoptions:,net-path:,net-server:,syslinux-splash:,username:,source:,source-images:,breakpoints,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:s:huv --shell sh -- "${@}"`"
+ ARGUMENTS="`getopt --longoptions apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,genisoimage:,initramfs:,losetup:,mode:,root-command:,tasksel:,includes:,templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,distribution:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,chroot-filesystem:,union-filesystem:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-images:,binary-indices:,bootappend:,bootloader:,chroot-build:,debian-installer:,encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,iso-memtest:,net-filesystem:,net-mountoptions:,net-path:,net-server:,syslinux-splash:,username:,source:,source-images:,breakpoints,conffile:,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:s:c:huv --shell sh -- "${@}"`"
if [ "${?}" != "0" ]
then
@@ -423,6 +423,11 @@
shift
;;
+ -c|-conffile)
+ LH_CONFFILE="${2}"
+ shift 2
+ ;;
+
--debug)
LH_DEBUG="enabled"
shift
@@ -483,6 +488,11 @@
Local_arguments "${@}"
+if [ -n "${LH_CONFFILE}" ]
+then
+ Read_conffile "${LH_CONFFILE}"
+fi
+
# Creating bootstrap configuration
mkdir -p config
mkdir -p config/includes
More information about the debian-live-changes
mailing list