manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renaming LH_BOOTAPPEND to LH_BOOTAPPEND_LIVE.

This commit is contained in:
Daniel Baumann 2007-09-23 14:05:11 +02:00
parent 26961cb572
commit 851d21e474
5 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions/defaults.sh
View File

@ -615,7 +615,7 @@ Set_defaults ()
LH_BINARY_INDICES="${LH_BINARY_INDICES:-enabled}" LH_BINARY_INDICES="${LH_BINARY_INDICES:-enabled}"
# Setting boot parameters # Setting boot parameters
# LH_BOOTAPPEND # LH_BOOTAPPEND_LIVE
# Setting bootloader # Setting bootloader
if [ -z "${LH_BOOTLOADER}" ] if [ -z "${LH_BOOTLOADER}" ]

18
helpers/lh_binary_grub
View File

@ -76,7 +76,7 @@ Grub_live_entry ()
APPEND="${4}" APPEND="${4}"
LINUX_LIVE="${LINUX_LIVE}\ntitle\t\tDebian GNU/Linux - ${LABEL}" LINUX_LIVE="${LINUX_LIVE}\ntitle\t\tDebian GNU/Linux - ${LABEL}"
LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} LH_BOOTAPPEND ${APPEND}" LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} LH_BOOTAPPEND_LIVE ${APPEND}"
LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}" LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
} }
@ -137,20 +137,20 @@ mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters # Setting boot parameters
if [ -n "${LH_ENCRYPTION}" ] if [ -n "${LH_ENCRYPTION}" ]
then then
LH_BOOTAPPEND="${LH_BOOTAPPEND} encryption=${LH_ENCRYPTION}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
fi fi
if [ -n "${LH_USERNAME}" ] if [ -n "${LH_USERNAME}" ]
then then
case "${LH_INITRAMFS}" in case "${LH_INITRAMFS}" in
casper) casper)
LH_BOOTAPPEND="${LH_BOOTAPPEND} username=${LH_USERNAME}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
;; ;;
live-initramfs) live-initramfs)
if [ "${LH_USERNAME}" != "user" ] if [ "${LH_USERNAME}" != "user" ]
then then
LH_BOOTAPPEND="${LH_BOOTAPPEND} username=${LH_USERNAME}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
fi fi
;; ;;
esac esac
@ -160,13 +160,13 @@ if [ -n "${LH_HOSTNAME}" ]
then then
case "${LH_INITRAMFS}" in case "${LH_INITRAMFS}" in
casper) casper)
LH_BOOTAPPEND="${LH_BOOTAPPEND} hostname=${LH_HOSTNAME}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
;; ;;
live-initramfs) live-initramfs)
if [ "${LH_HOSTNAME}" != "debian" ] if [ "${LH_HOSTNAME}" != "debian" ]
then then
LH_BOOTAPPEND="${LH_BOOTAPPEND} hostname=${LH_HOSTNAME}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
fi fi
;; ;;
esac esac
@ -174,10 +174,10 @@ fi
if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ] if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ]
then then
LH_BOOTAPPEND="${LH_BOOTAPPEND} union=${LH_UNION_FILESYSTEM}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
fi fi
LH_BOOTAPPEND="`echo ${LH_BOOTAPPEND} | sed -e 's/ //'`" LH_BOOTAPPEND_LIVE="`echo ${LH_BOOTAPPEND_LIVE} | sed -e 's/ //'`"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt # Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal" FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
@ -290,7 +290,7 @@ then
fi fi
sed -i -e "s#LINUX_LIVE#${LINUX_LIVE}#" -e "s#LINUX_INSTALL#${LINUX_INSTALL}#" -e "s#MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst sed -i -e "s#LINUX_LIVE#${LINUX_LIVE}#" -e "s#LINUX_INSTALL#${LINUX_INSTALL}#" -e "s#MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
sed -i -e "s#LH_BOOTAPPEND#${LH_BOOTAPPEND}#" binary/boot/grub/menu.lst sed -i -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" binary/boot/grub/menu.lst
sed -i -e 's/\ $//g' binary/boot/grub/menu.lst sed -i -e 's/\ $//g' binary/boot/grub/menu.lst

28
helpers/lh_binary_syslinux
View File

@ -85,7 +85,7 @@ Syslinux_live_entry ()
LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n" LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tkernel /${KERNEL}\n" LINUX_LIVE="${LINUX_LIVE}\tkernel /${KERNEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tappend initrd=/${INITRD} boot=${INITFS} LH_BOOTAPPEND ${APPEND}\n" LINUX_LIVE="${LINUX_LIVE}\tappend initrd=/${INITRD} boot=${INITFS} LH_BOOTAPPEND_LIVE ${APPEND}\n"
} }
Syslinux_install_entry () Syslinux_install_entry ()
@ -175,20 +175,20 @@ mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters # Setting boot parameters
if [ -n "${LH_ENCRYPTION}" ] if [ -n "${LH_ENCRYPTION}" ]
then then
LH_BOOTAPPEND="${LH_BOOTAPPEND} encryption=${LH_ENCRYPTION}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
fi fi
if [ -n "${LH_USERNAME}" ] if [ -n "${LH_USERNAME}" ]
then then
case "${LH_INITRAMFS}" in case "${LH_INITRAMFS}" in
casper) casper)
LH_BOOTAPPEND="${LH_BOOTAPPEND} username=${LH_USERNAME}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
;; ;;
live-initramfs) live-initramfs)
if [ "${LH_USERNAME}" != "user" ] if [ "${LH_USERNAME}" != "user" ]
then then
LH_BOOTAPPEND="${LH_BOOTAPPEND} username=${LH_USERNAME}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
fi fi
;; ;;
esac esac
@ -198,13 +198,13 @@ if [ -n "${LH_HOSTNAME}" ]
then then
case "${LH_INITRAMFS}" in case "${LH_INITRAMFS}" in
casper) casper)
LH_BOOTAPPEND="${LH_BOOTAPPEND} hostname=${LH_HOSTNAME}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
;; ;;
live-initramfs) live-initramfs)
if [ "${LH_HOSTNAME}" != "debian" ] if [ "${LH_HOSTNAME}" != "debian" ]
then then
LH_BOOTAPPEND="${LH_BOOTAPPEND} hostname=${LH_HOSTNAME}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
fi fi
;; ;;
esac esac
@ -212,18 +212,18 @@ fi
if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ] if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ]
then then
LH_BOOTAPPEND="${LH_BOOTAPPEND} union=${LH_UNION_FILESYSTEM}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
fi fi
if [ "${LH_BINARY_IMAGES}" = "net" ] if [ "${LH_BINARY_IMAGES}" = "net" ]
then then
case "${LH_NET_FILESYSTEM}" in case "${LH_NET_FILESYSTEM}" in
nfs) nfs)
LH_BOOTAPPEND="${LH_BOOTAPPEND} netboot=nfs nfsroot=LH_NET_SERVER:LH_NET_PATH" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} netboot=nfs nfsroot=LH_NET_SERVER:LH_NET_PATH"
;; ;;
cifs) cifs)
LH_BOOTAPPEND="${LH_BOOTAPPEND} netboot=cifs nfsroot=//LH_NET_SERVERLH_NET_PATH" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} netboot=cifs nfsroot=//LH_NET_SERVERLH_NET_PATH"
;; ;;
*) *)
@ -234,11 +234,11 @@ then
if [ -n "${LH_NET_MOUNTOPTIONS}" ] if [ -n "${LH_NET_MOUNTOPTIONS}" ]
then then
LH_BOOTAPPEND="${LH_BOOTAPPEND} nfsopts=${LH_NET_MOUNTOPTIONS}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} nfsopts=${LH_NET_MOUNTOPTIONS}"
fi fi
fi fi
LH_BOOTAPPEND="`echo ${LH_BOOTAPPEND} | sed -e 's/ //'`" LH_BOOTAPPEND_LIVE="`echo ${LH_BOOTAPPEND_LIVE} | sed -e 's/ //'`"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt # Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal" FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
@ -390,7 +390,7 @@ case "${LH_BINARY_IMAGES}" in
# Configure syslinux templates # Configure syslinux templates
sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" binary/isolinux/isolinux.cfg sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" binary/isolinux/isolinux.cfg
sed -i -e "s#LH_BOOTAPPEND#${LH_BOOTAPPEND}#" binary/isolinux/isolinux.cfg sed -i -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" binary/isolinux/isolinux.cfg
sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/`date +%Y%m%d`/" -e "s/LH_MEDIA/CD-ROM/" binary/isolinux/f1.txt sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/`date +%Y%m%d`/" -e "s/LH_MEDIA/CD-ROM/" binary/isolinux/f1.txt
sed -i -e "s/LH_MEDIA/CD-ROM/" binary/isolinux/f3.txt sed -i -e "s/LH_MEDIA/CD-ROM/" binary/isolinux/f3.txt
sed -i -e "s/LH_VERSION/${VERSION}/" binary/isolinux/f10.txt sed -i -e "s/LH_VERSION/${VERSION}/" binary/isolinux/f10.txt
@ -494,7 +494,7 @@ case "${LH_BINARY_IMAGES}" in
# Configure syslinux templates # Configure syslinux templates
sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" tftpboot/pxelinux.cfg/default sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" tftpboot/pxelinux.cfg/default
sed -i -e "s#LH_BOOTAPPEND#${LH_BOOTAPPEND}#" -e "s/LH_NET_SERVER/${LH_NET_SERVER}/" -e "s#LH_NET_PATH#${LH_NET_PATH}#" tftpboot/pxelinux.cfg/default sed -i -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" -e "s/LH_NET_SERVER/${LH_NET_SERVER}/" -e "s#LH_NET_PATH#${LH_NET_PATH}#" tftpboot/pxelinux.cfg/default
sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/`date +%Y%m%d`/" -e "s/LH_MEDIA/netboot/" tftpboot/pxelinux.cfg/f1.txt sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/`date +%Y%m%d`/" -e "s/LH_MEDIA/netboot/" tftpboot/pxelinux.cfg/f1.txt
sed -i -e "s/LH_MEDIA/netboot/" tftpboot/pxelinux.cfg/f3.txt sed -i -e "s/LH_MEDIA/netboot/" tftpboot/pxelinux.cfg/f3.txt
sed -i -e "s/LH_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt sed -i -e "s/LH_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
@ -588,7 +588,7 @@ case "${LH_BINARY_IMAGES}" in
# Configure syslinux templates # Configure syslinux templates
sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" "${DESTDIR}"/syslinux.cfg sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" "${DESTDIR}"/syslinux.cfg
sed -i -e "s#LH_BOOTAPPEND#${LH_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg sed -i -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" "${DESTDIR}"/syslinux.cfg
sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/`date +%Y%m%d`/" -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f1.txt #FIXME sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/`date +%Y%m%d`/" -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f1.txt #FIXME
sed -i -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f3.txt #FIXME sed -i -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f3.txt #FIXME
sed -i -e "s/LH_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt sed -i -e "s/LH_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt

20
helpers/lh_binary_yaboot
View File

@ -80,7 +80,7 @@ Yaboot_live_entry ()
LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n" LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n" LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n" LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n"
LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} LH_BOOTAPPEND ${APPEND}\"\n" LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} LH_BOOTAPPEND_LIVE ${APPEND}\"\n"
LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n" LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n"
} }
@ -101,7 +101,7 @@ Yaboot_install_entry ()
LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n" LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tlabel=${LABEL}\n" LINUX_INSTALL="${LINUX_INSTALL}\tlabel=${LABEL}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tinitrd=${DIRECTORY}/${INITRD}\n" LINUX_INSTALL="${LINUX_INSTALL}\tinitrd=${DIRECTORY}/${INITRD}\n"
LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"LH_BOOTAPPEND ${APPEND} --\"\n" LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"LH_BOOTAPPEND_LIVE ${APPEND} --\"\n"
LINUX_INSTALL="${LINUX_INSTALL}\tinitrd-size=10240\n" LINUX_INSTALL="${LINUX_INSTALL}\tinitrd-size=10240\n"
} }
@ -145,20 +145,20 @@ mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters # Setting boot parameters
if [ -n "${LH_ENCRYPTION}" ] if [ -n "${LH_ENCRYPTION}" ]
then then
LH_BOOTAPPEND="${LH_BOOTAPPEND} encryption=${LH_ENCRYPTION}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
fi fi
if [ -n "${LH_USERNAME}" ] if [ -n "${LH_USERNAME}" ]
then then
case "${LH_INITRAMFS}" in case "${LH_INITRAMFS}" in
casper) casper)
LH_BOOTAPPEND="${LH_BOOTAPPEND} username=${LH_USERNAME}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
;; ;;
live-initramfs) live-initramfs)
if [ "${LH_USERNAME}" != "user" ] if [ "${LH_USERNAME}" != "user" ]
then then
LH_BOOTAPPEND="${LH_BOOTAPPEND} username=${LH_USERNAME}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
fi fi
;; ;;
esac esac
@ -168,13 +168,13 @@ if [ -n "${LH_HOSTNAME}" ]
then then
case "${LH_INITRAMFS}" in case "${LH_INITRAMFS}" in
casper) casper)
LH_BOOTAPPEND="${LH_BOOTAPPEND} hostname=${LH_HOSTNAME}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
;; ;;
live-initramfs) live-initramfs)
if [ "${LH_HOSTNAME}" != "debian" ] if [ "${LH_HOSTNAME}" != "debian" ]
then then
LH_BOOTAPPEND="${LH_BOOTAPPEND} hostname=${LH_HOSTNAME}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
fi fi
;; ;;
esac esac
@ -182,10 +182,10 @@ fi
if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ] if [ "${LH_UNION_FILESYSTEM}" != "unionfs" ]
then then
LH_BOOTAPPEND="${LH_BOOTAPPEND} union=${LH_UNION_FILESYSTEM}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
fi fi
LH_BOOTAPPEND="`echo ${LH_BOOTAPPEND} | sed -e 's/ //'`" LH_BOOTAPPEND_LIVE="`echo ${LH_BOOTAPPEND_LIVE} | sed -e 's/ //'`"
# Parameters are listed at: linux/Documentation/kernel-parameters.txt # Parameters are listed at: linux/Documentation/kernel-parameters.txt
FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=ofonly" FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=ofonly"
@ -266,7 +266,7 @@ case "${LH_BINARY_IMAGES}" in
# Configure yaboot templates # Configure yaboot templates
sed -i -e "s#LINUX_LIVE#${LINUX_LIVE}#" -e "s#LINUX_INSTALL#${LINUX_INSTALL}#" binary/yaboot/yaboot.conf sed -i -e "s#LINUX_LIVE#${LINUX_LIVE}#" -e "s#LINUX_INSTALL#${LINUX_INSTALL}#" binary/yaboot/yaboot.conf
sed -i -e "s#LH_BOOTAPPEND#${LH_BOOTAPPEND}#" binary/yaboot/yaboot.conf sed -i -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" binary/yaboot/yaboot.conf
sed -i -e "s/LH_DATE/`date +%Y%m%d`/" -e "s/LH_VERSION/${VERSION}/" binary/yaboot/boot.msg sed -i -e "s/LH_DATE/`date +%Y%m%d`/" -e "s/LH_VERSION/${VERSION}/" binary/yaboot/boot.msg
;; ;;
esac esac

12
helpers/lh_config
View File

@ -30,7 +30,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [-a|--architecture ARCHITECTURE]\n\ \t [-a|--architecture ARCHITECTURE]\n\
\t [-b|--binary-images iso|net|tar|usb-hdd]\n\ \t [-b|--binary-images iso|net|tar|usb-hdd]\n\
\t [--binary-indices enabled|disabled]\n\ \t [--binary-indices enabled|disabled]\n\
\t [--bootappend PARAMETER|\"PARAMETERS\"]\n\ \t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
\t [--bootloader grub|syslinux|yaboot]\n\ \t [--bootloader grub|syslinux|yaboot]\n\
\t [--bootstrap cdebootstrap|debootstrap]\n\ \t [--bootstrap cdebootstrap|debootstrap]\n\
\t [--bootstrap-config FILE]\n\ \t [--bootstrap-config FILE]\n\
@ -100,7 +100,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
Local_arguments () 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:,debian-installer-daily:,encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,iso-memtest:,net-filesystem:,net-mountoptions:,net-path:,net-server:,syslinux-splash:,syslinux-timeout:,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 -- "${@}"`" 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-live:,bootloader:,chroot-build:,debian-installer:,debian-installer-daily:,encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,iso-memtest:,net-filesystem:,net-mountoptions:,net-path:,net-server:,syslinux-splash:,syslinux-timeout:,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" ] if [ "${?}" != "0" ]
then then
@ -392,8 +392,8 @@ Local_arguments ()
shift 2 shift 2
;; ;;
--bootappend) --bootappend-live)
LH_BOOTAPPEND="${2}" LH_BOOTAPPEND_LIVE="${2}"
shift 2 shift 2
;; ;;
@ -836,9 +836,9 @@ LH_BINARY_IMAGES="${LH_BINARY_IMAGES}"
# (Default: ${LH_BINARY_INDICES}) # (Default: ${LH_BINARY_INDICES})
LH_BINARY_INDICES="${LH_BINARY_INDICES}" LH_BINARY_INDICES="${LH_BINARY_INDICES}"
# \$LH_BOOTAPPEND: set boot parameters # \$LH_BOOTAPPEND_LIVE: set boot parameters
# (Default: empty) # (Default: empty)
LH_BOOTAPPEND="${LH_BOOTAPPEND}" LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE}"
# \$LH_BOOTLOADER: set bootloader # \$LH_BOOTLOADER: set bootloader
# (Default: ${LH_BOOTLOADER}) # (Default: ${LH_BOOTLOADER})