diff options
92 files changed, 550 insertions, 31 deletions
@@ -91,9 +91,9 @@ uninstall: update: set -e; for FILE in functions/*.sh examples/cron/*.sh manpages/*.de.* manpages/*.en.*; \ do \ - sed -i -e 's/2007\\-07\\-30/2007\\-08\\-06/' \ - -e 's/30.07.2007/06.08.2007/' \ - -e 's/1.0~a21/1.0~a22/' \ + sed -i -e 's/2007\\-08\\-13/2007\\-08\\-20/' \ + -e 's/13.08.2007/20.08.2007/' \ + -e 's/1.0~a23/1.0~a24/' \ $$FILE; \ done diff --git a/debian/changelog b/debian/changelog index a7328a2..41552df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-helper (1.0~a23-1) unstable; urgency=medium + + * New upstream release. + + -- Daniel Baumann <daniel@debian.org> Mon, 13 Aug 2007 00:00:00 +0200 + live-helper (1.0~a22-1) unstable; urgency=medium * New upstream release: diff --git a/docs/ChangeLog b/docs/ChangeLog index d1b862b..4f8a769 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,21 @@ +2007-08-14 Daniel Baumann <daniel@debian.org> + + * helpers/*: + - Added --conffile to all helpers. + * manpages/lh_config.de.1, lh_config.en.1: + - Added. + * Uploading 1.0~a23-1. + +2007-08-13 Daniel Baumann <daniel@debian.org> + + * helpers/lh_binary_memtest: + - Improved grub workaround. + +2007-08-12 Daniel Baumann <daniel@debian.org> + + * helpers/lh_chroot_dpkg: + - Added. + 2007-08-12 Daniel Baumann <daniel@debian.org> * Uploaded 1.0~a22-1. diff --git a/functions/common.sh b/functions/common.sh index 2858239..c7f8269 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -10,4 +10,4 @@ set -e PROGRAM="`basename ${0}`" -VERSION="1.0~a22" +VERSION="1.0~a23" diff --git a/helpers/lh_binary b/helpers/lh_binary index 4a1577d..b516789 100755 --- a/helpers/lh_binary +++ b/helpers/lh_binary @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Preparing root filesystem diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot index 150d6b1..c40afc9 100755 --- a/helpers/lh_binary_chroot +++ b/helpers/lh_binary_chroot @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin copying chroot..." diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 6ae67cd..b407878 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Setting remote d-i directories diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk index 5543949..65470be 100755 --- a/helpers/lh_binary_disk +++ b/helpers/lh_binary_disk @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BINARY_IMAGES}" != "iso" ] diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption index 0fb9b7e..4d9a0e7 100755 --- a/helpers/lh_binary_encryption +++ b/helpers/lh_binary_encryption @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ -z "${LH_ENCRYPTION}" ] diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub index ccb7153..b3ea4a0 100755 --- a/helpers/lh_binary_grub +++ b/helpers/lh_binary_grub @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BOOTLOADER}" != "grub" ] diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes index b426a68..83f207e 100755 --- a/helpers/lh_binary_includes +++ b/helpers/lh_binary_includes @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_INCLUDES}" = "none" ] diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index 7da3da8..8b00a3d 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if ! echo "${LH_BINARY_IMAGES}" | grep -qs iso diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image index fb5ab98..33c2fbb 100755 --- a/helpers/lh_binary_linux-image +++ b/helpers/lh_binary_linux-image @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin install linux-image..." @@ -108,7 +109,7 @@ case "${LH_INITRAMFS}" in casper) # Checking casper templates Check_templates casper - cp "${TEMPLATES}"/casper/parameters.txt "${DESTDIR}"/parameters.txt + cp "${TEMPLATES}"/parameters.txt "${DESTDIR}"/parameters.txt ;; live-initramfs) diff --git a/helpers/lh_binary_local-hooks b/helpers/lh_binary_local-hooks index e758247..7e469b4 100755 --- a/helpers/lh_binary_local-hooks +++ b/helpers/lh_binary_local-hooks @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin executing local hooks..." diff --git a/helpers/lh_binary_local-includes b/helpers/lh_binary_local-includes index 84434c5..6d0f346 100755 --- a/helpers/lh_binary_local-includes +++ b/helpers/lh_binary_local-includes @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin copying binary local includes..." diff --git a/helpers/lh_binary_manifest b/helpers/lh_binary_manifest index 779d2ed..0eabd8b 100755 --- a/helpers/lh_binary_manifest +++ b/helpers/lh_binary_manifest @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin creating manifest..." diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum index cb901c8..9b0d81d 100755 --- a/helpers/lh_binary_md5sum +++ b/helpers/lh_binary_md5sum @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin creating binary md5sum.txt..." @@ -54,7 +55,7 @@ fi # Calculating md5sums cd binary -find . -type f | sort | grep -v 'isolinux/isolinux.bin' | grep -v 'boot/grub/stage2_eltorito' | xargs md5sum > ../md5sum.txt +find . -type f | sort | grep -v 'isolinux/isolinux.bin' | grep -v 'boot/grub/stage2_eltorito' | xargs -I{} md5sum "{}" > ../md5sum.txt cat > md5sum.txt << EOF This file contains the list of md5 checksums of all files on this medium. diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest index 28621f6..2985285 100755 --- a/helpers/lh_binary_memtest +++ b/helpers/lh_binary_memtest @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_MEMTEST}" = "disabled" ] @@ -60,11 +61,12 @@ fi if [ "${LH_CHROOT_BUILD}" = "enabled" ] then - if [ -f chroot/usr/sbin/grub ] && [ ! -d chroot/boot/grub ] + if [ -f chroot/usr/sbin/grub ] && [ ! -f chroot/boot/grub/menu.lst ] then GRUB="yes" mkdir -p chroot/boot/grub + touch chroot/boot/grub/menu.lst fi fi diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net index 40286d4..2fb6e2c 100755 --- a/helpers/lh_binary_net +++ b/helpers/lh_binary_net @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if ! echo "${LH_BINARY_IMAGES}" | grep -qs net diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index 15feb5f..f800709 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin building root filesystem image..." diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 0568de9..1f77ce8 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BOOTLOADER}" != "syslinux" ] diff --git a/helpers/lh_binary_tar b/helpers/lh_binary_tar index 3435935..ed1cab8 100755 --- a/helpers/lh_binary_tar +++ b/helpers/lh_binary_tar @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if ! echo "${LH_BINARY_IMAGES}" | grep -qs tar diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd index f13896c..09c38f7 100755 --- a/helpers/lh_binary_usb-hdd +++ b/helpers/lh_binary_usb-hdd @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if ! echo "${LH_BINARY_IMAGES}" | grep -qs usb-hdd diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot index dcdb839..73da490 100755 --- a/helpers/lh_binary_yaboot +++ b/helpers/lh_binary_yaboot @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BOOTLOADER}" != "yaboot" ] diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap index c16f10c..4d9cf46 100755 --- a/helpers/lh_bootstrap +++ b/helpers/lh_bootstrap @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Bootstrapping system diff --git a/helpers/lh_bootstrap_cache b/helpers/lh_bootstrap_cache index 03ae904..e6c8dcc 100755 --- a/helpers/lh_bootstrap_cache +++ b/helpers/lh_bootstrap_cache @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin caching bootstrap stage..." diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index 37c8c79..dcc350d 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ] diff --git a/helpers/lh_bootstrap_copy b/helpers/lh_bootstrap_copy index c1991fb..d84916c 100755 --- a/helpers/lh_bootstrap_copy +++ b/helpers/lh_bootstrap_copy @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BOOTSTRAP}" != "copy" ] diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index ad71962..7661025 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_BOOTSTRAP}" != "debootstrap" ] diff --git a/helpers/lh_chroot b/helpers/lh_chroot index a50f92d..aafe71f 100755 --- a/helpers/lh_chroot +++ b/helpers/lh_chroot @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Configuring chroot @@ -37,6 +38,7 @@ lh_chroot_cache restore ${*} lh_chroot_proc install ${*} lh_chroot_sysfs install ${*} lh_chroot_debianchroot install ${*} +lh_chroot_dpkg install ${*} lh_chroot_sysv-rc install ${*} lh_chroot_hosts install ${*} lh_chroot_resolv install ${*} @@ -70,6 +72,7 @@ lh_chroot_hostname remove ${*} lh_chroot_resolv remove ${*} lh_chroot_hosts remove ${*} lh_chroot_sysv-rc remove ${*} +lh_chroot_dpkg remove ${*} lh_chroot_debianchroot remove ${*} lh_chroot_sysfs remove ${*} lh_chroot_proc remove ${*} diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt index 2534efd..5ba5b00 100755 --- a/helpers/lh_chroot_apt +++ b/helpers/lh_chroot_apt @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_cache b/helpers/lh_chroot_cache index 2f016a6..157a48e 100755 --- a/helpers/lh_chroot_cache +++ b/helpers/lh_chroot_cache @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin caching chroot stage..." diff --git a/helpers/lh_chroot_debianchroot b/helpers/lh_chroot_debianchroot index 3a193a6..beabbd2 100755 --- a/helpers/lh_chroot_debianchroot +++ b/helpers/lh_chroot_debianchroot @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_dpkg b/helpers/lh_chroot_dpkg new file mode 100755 index 0000000..ae08f8a --- /dev/null +++ b/helpers/lh_chroot_dpkg @@ -0,0 +1,88 @@ +#!/bin/sh + +# lh_chroot_dpkg(1) - manage /sbin/dpkg +# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Including common functions +LH_BASE="${LH_BASE:-/usr/share/live-helper}" + +for FUNCTION in "${LH_BASE}"/functions/*.sh +do + . "${FUNCTION}" +done + +# Setting static variables +DESCRIPTION="manage /sbin/dpkg" +HELP="" +USAGE="${PROGRAM} {install|remove} [--force]" + +Arguments "${@}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Read_conffile "${LH_CONFIG}" +Set_defaults + +# Requiring stage file +Require_stagefile .stage/bootstrap + +case "${1}" in + install) + Echo_message "Configuring file /sbin/start-stop-daemon" + + # Checking stage file + Check_stagefile .stage/chroot_dpkg + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + # Save start-stop-daemon program + mv chroot/sbin/start-stop-daemon chroot/sbin/start-stop-daemon.orig + + # Create start-stop-daemon program + +cat > chroot/sbin/start-stop-daemon << EOF +#!/bin/sh + +exit 0 +EOF + + chmod 755 chroot/sbin/start-stop-daemon + + # Creating stage file + Create_stagefile .stage/chroot_dpkg + ;; + + remove) + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + Echo_message "Deconfiguring file /sbin/start-stop-daemon" + + # Restore start-stop-daemon program + mv chroot/sbin/start-stop-daemon.orig chroot/sbin/start-stop-daemon + + # Removing stage file + rm -f .stage/chroot_dpkg + ;; + + *) + Usage + ;; +esac diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks index a8ee989..2b571a5 100755 --- a/helpers/lh_chroot_hacks +++ b/helpers/lh_chroot_hacks @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin executing hacks..." diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks index 3e1fc0d..0ae95bc 100755 --- a/helpers/lh_chroot_hooks +++ b/helpers/lh_chroot_hooks @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin executing hooks..." diff --git a/helpers/lh_chroot_hostname b/helpers/lh_chroot_hostname index 7d04d68..0106eee 100755 --- a/helpers/lh_chroot_hostname +++ b/helpers/lh_chroot_hostname @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_hosts b/helpers/lh_chroot_hosts index 2cd8f08..c4d633e 100755 --- a/helpers/lh_chroot_hosts +++ b/helpers/lh_chroot_hosts @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_interactive b/helpers/lh_chroot_interactive index 8c63e22..236e69b 100755 --- a/helpers/lh_chroot_interactive +++ b/helpers/lh_chroot_interactive @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_INTERACTIVE}" = "disabled" ] diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image index 44bbfa5..af93d1d 100755 --- a/helpers/lh_chroot_linux-image +++ b/helpers/lh_chroot_linux-image @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_local-hooks b/helpers/lh_chroot_local-hooks index 75702db..6197b48 100755 --- a/helpers/lh_chroot_local-hooks +++ b/helpers/lh_chroot_local-hooks @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin executing local hooks..." diff --git a/helpers/lh_chroot_local-includes b/helpers/lh_chroot_local-includes index 329c566..5a66a1e 100755 --- a/helpers/lh_chroot_local-includes +++ b/helpers/lh_chroot_local-includes @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin copying chroot local includes..." diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages index fd42695..f546868 100755 --- a/helpers/lh_chroot_local-packages +++ b/helpers/lh_chroot_local-packages @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin installing local packages..." diff --git a/helpers/lh_chroot_local-packageslists b/helpers/lh_chroot_local-packageslists index dcebd7c..bd615e3 100755 --- a/helpers/lh_chroot_local-packageslists +++ b/helpers/lh_chroot_local-packageslists @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin installing local packages lists..." diff --git a/helpers/lh_chroot_local-preseed b/helpers/lh_chroot_local-preseed index f93f463..bc5bb2e 100755 --- a/helpers/lh_chroot_local-preseed +++ b/helpers/lh_chroot_local-preseed @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin executing locale preseed..." diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization index 25e8d5f..e24de69 100755 --- a/helpers/lh_chroot_localization +++ b/helpers/lh_chroot_localization @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin installing localization packages..." diff --git a/helpers/lh_chroot_packages b/helpers/lh_chroot_packages index 87e8eaf..661b335 100755 --- a/helpers/lh_chroot_packages +++ b/helpers/lh_chroot_packages @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin installing packages..." diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists index 2c21574..7d0cdef 100755 --- a/helpers/lh_chroot_packageslists +++ b/helpers/lh_chroot_packageslists @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin installing packages lists..." diff --git a/helpers/lh_chroot_preseed b/helpers/lh_chroot_preseed index 55732ef..49d5aa1 100755 --- a/helpers/lh_chroot_preseed +++ b/helpers/lh_chroot_preseed @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin executing preseed..." diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc index 66b4c3c..0dc12ab 100755 --- a/helpers/lh_chroot_proc +++ b/helpers/lh_chroot_proc @@ -33,6 +33,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin mounting /proc..." diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv index 0409054..eeeead2 100755 --- a/helpers/lh_chroot_resolv +++ b/helpers/lh_chroot_resolv @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index 4e46ea9..307aeba 100755 --- a/helpers/lh_chroot_sources +++ b/helpers/lh_chroot_sources @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks index 4fffd14..fb7155d 100755 --- a/helpers/lh_chroot_symlinks +++ b/helpers/lh_chroot_symlinks @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SYMLINKS}" != "enabled" ] diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs index 996262d..f9d1f41 100755 --- a/helpers/lh_chroot_sysfs +++ b/helpers/lh_chroot_sysfs @@ -33,6 +33,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin mounting /sys..." diff --git a/helpers/lh_chroot_sysv-rc b/helpers/lh_chroot_sysv-rc index d77306a..a9a436b 100755 --- a/helpers/lh_chroot_sysv-rc +++ b/helpers/lh_chroot_sysv-rc @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Requiring stage file diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit index ffed709..b4927b6 100755 --- a/helpers/lh_chroot_sysvinit +++ b/helpers/lh_chroot_sysvinit @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Configuring package sysvinit" diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks index 49f44b6..46277d7 100755 --- a/helpers/lh_chroot_tasks +++ b/helpers/lh_chroot_tasks @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults Echo_message "Begin installing tasks..." diff --git a/helpers/lh_clean b/helpers/lh_clean index c417415..4c52ed2 100755 --- a/helpers/lh_clean +++ b/helpers/lh_clean @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults rm -f .lock @@ -53,6 +54,7 @@ case "${1}" in ;; chroot) + Echo_message "Cleaning chroot" ${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true ${LH_ROOT_COMMAND} umount -f chroot/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true ${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true diff --git a/helpers/lh_config b/helpers/lh_config index 60e8530..766a853 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -487,6 +487,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" # Setting defaults Set_defaults diff --git a/helpers/lh_losetup b/helpers/lh_losetup index 8ef33c9..662b4ad 100755 --- a/helpers/lh_losetup +++ b/helpers/lh_losetup @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults DEVICE="${1}" diff --git a/helpers/lh_source b/helpers/lh_source index 6e04bb4..f9b59fe 100755 --- a/helpers/lh_source +++ b/helpers/lh_source @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Enabling network in chroot diff --git a/helpers/lh_source_debian b/helpers/lh_source_debian index b15f093..e939e6c 100755 --- a/helpers/lh_source_debian +++ b/helpers/lh_source_debian @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_source_debian-live b/helpers/lh_source_debian-live index 00ddd23..d92fe3a 100755 --- a/helpers/lh_source_debian-live +++ b/helpers/lh_source_debian-live @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk index 78242d8..e387749 100755 --- a/helpers/lh_source_disk +++ b/helpers/lh_source_disk @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE_IMAGES}" != "iso" ] diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso index da1e98e..b568781 100755 --- a/helpers/lh_source_iso +++ b/helpers/lh_source_iso @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum index 55e0d23..bf7f378 100755 --- a/helpers/lh_source_md5sum +++ b/helpers/lh_source_md5sum @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_source_net b/helpers/lh_source_net index c6ef057..eed33c9 100755 --- a/helpers/lh_source_net +++ b/helpers/lh_source_net @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_source_tar b/helpers/lh_source_tar index 5a4d018..2e6ae38 100755 --- a/helpers/lh_source_tar +++ b/helpers/lh_source_tar @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd index cf93786..ff78393 100755 --- a/helpers/lh_source_usb-hdd +++ b/helpers/lh_source_usb-hdd @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults if [ "${LH_SOURCE}" != "enabled" ] diff --git a/helpers/lh_testroot b/helpers/lh_testroot index 90464ec..f213f86 100755 --- a/helpers/lh_testroot +++ b/helpers/lh_testroot @@ -30,6 +30,7 @@ Read_conffile config/bootstrap Read_conffile config/chroot Read_conffile config/binary Read_conffile config/source +Read_conffile "${LH_CONFIG}" Set_defaults # Checking user account diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1 index 367c7af..3100a88 100644 --- a/manpages/lh_binary.de.1 +++ b/manpages/lh_binary.de.1 @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "06.08.2007" "1.0~a22" "live\-helper" +.TH LH_BINARY 1 "13.08.2007" "1.0~a23" "live\-helper" .SH NAME lh_binary \- Meta\-Helper f\[:u]r lh_binary_* diff --git a/manpages/lh_binary.en.1 b/manpages/lh_binary.en.1 index 3d952aa..97fc3bd 100644 --- a/manpages/lh_binary.en.1 +++ b/manpages/lh_binary.en.1 @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "2007\-08\-06" "1.0~a22" "live\-helper" +.TH LH_BINARY 1 "2007\-08\-13" "1.0~a23" "live\-helper" .SH NAME lh_binary \- meta\-helper for lh_binary_* diff --git a/manpages/lh_bootstrap.de.1 b/manpages/lh_bootstrap.de.1 index 08c70bf..db538f5 100644 --- a/manpages/lh_bootstrap.de.1 +++ b/manpages/lh_bootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "06.08.2007" "1.0~a22" "live\-helper" +.TH LH_BOOTSTRAP 1 "13.08.2007" "1.0~a23" "live\-helper" .SH NAME lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_* diff --git a/manpages/lh_bootstrap.en.1 b/manpages/lh_bootstrap.en.1 index 4afda05..afaec2c 100644 --- a/manpages/lh_bootstrap.en.1 +++ b/manpages/lh_bootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "2007\-08\-06" "1.0~a22" "live\-helper" +.TH LH_BOOTSTRAP 1 "2007\-08\-13" "1.0~a23" "live\-helper" .SH NAME lh_bootstrap \- meta\-helper for lh_bootstrap_* diff --git a/manpages/lh_bootstrap_cdebootstrap.de.1 b/manpages/lh_bootstrap_cdebootstrap.de.1 index c97da1b..e1c5805 100644 --- a/manpages/lh_bootstrap_cdebootstrap.de.1 +++ b/manpages/lh_bootstrap_cdebootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "06.08.2007" "1.0~a22" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "13.08.2007" "1.0~a23" "live\-helper" .SH NAME lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1) diff --git a/manpages/lh_bootstrap_cdebootstrap.en.1 b/manpages/lh_bootstrap_cdebootstrap.en.1 index 09252ca..23f48b4 100644 --- a/manpages/lh_bootstrap_cdebootstrap.en.1 +++ b/manpages/lh_bootstrap_cdebootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-08\-06" "1.0~a22" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-08\-13" "1.0~a23" "live\-helper" .SH NAME lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1) diff --git a/manpages/lh_bootstrap_debootstrap.de.1 b/manpages/lh_bootstrap_debootstrap.de.1 index 1dd7790..7a453cb 100644 --- a/manpages/lh_bootstrap_debootstrap.de.1 +++ b/manpages/lh_bootstrap_debootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "06.08.2007" "1.0~a22" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "13.08.2007" "1.0~a23" "live\-helper" .SH NAME lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8) diff --git a/manpages/lh_bootstrap_debootstrap.en.1 b/manpages/lh_bootstrap_debootstrap.en.1 index 524b3d6..e5b0e29 100644 --- a/manpages/lh_bootstrap_debootstrap.en.1 +++ b/manpages/lh_bootstrap_debootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-08\-06" "1.0~a22" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-08\-13" "1.0~a23" "live\-helper" .SH NAME lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8) diff --git a/manpages/lh_build.de.1 b/manpages/lh_build.de.1 index b7f7177..4895e1a 100644 --- a/manpages/lh_build.de.1 +++ b/manpages/lh_build.de.1 @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "06.08.2007" "1.0~a22" "live\-helper" +.TH LH_BUILD 1 "13.08.2007" "1.0~a23" "live\-helper" .SH NAME lh_build \- erstellen eines Live-Systemes diff --git a/manpages/lh_build.en.1 b/manpages/lh_build.en.1 index 115d13d..09fd642 100644 --- a/manpages/lh_build.en.1 +++ b/manpages/lh_build.en.1 @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "2007\-08\-06" "1.0~a22" "live\-helper" +.TH LH_BUILD 1 "2007\-08\-13" "1.0~a23" "live\-helper" .SH NAME lh_build \- building a live system diff --git a/manpages/lh_chroot.de.1 b/manpages/lh_chroot.de.1 index d9263a7..a4b3cbb 100644 --- a/manpages/lh_chroot.de.1 +++ b/manpages/lh_chroot.de.1 @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "06.08.2007" "1.0~a22" "live\-helper" +.TH LH_CHROOT 1 "13.08.2007" "1.0~a23" "live\-helper" .SH NAME lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_* diff --git a/manpages/lh_chroot.en.1 b/manpages/lh_chroot.en.1 index f5cef11..7139ac0 100644 --- a/manpages/lh_chroot.en.1 +++ b/manpages/lh_chroot.en.1 @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "2007\-08\-06" "1.0~a22" "live\-helper" +.TH LH_CHROOT 1 "2007\-08\-13" "1.0~a23" "live\-helper" .SH NAME lh_chroot \- meta\-helper for lh_chroot_* diff --git a/manpages/lh_clean.de.1 b/manpages/lh_clean.de.1 index 49d575c..06df505 100644 --- a/manpages/lh_clean.de.1 +++ b/manpages/lh_clean.de.1 @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "06.08.2007" "1.0~a22" "live\-helper" +.TH LH_CLEAN 1 "13.08.2007" "1.0~a23" "live\-helper" .SH NAME lh_clean \- r\[:a]umt das Build-Verzeichnis auf diff --git a/manpages/lh_clean.en.1 b/manpages/lh_clean.en.1 index c45003c..2684ef7 100644 --- a/manpages/lh_clean.en.1 +++ b/manpages/lh_clean.en.1 @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "2007\-08\-06" "1.0~a22" "live\-helper" +.TH LH_CLEAN 1 "2007\-08\-13" "1.0~a23" "live\-helper" .SH NAME lh_clean \- clean up system build directories diff --git a/manpages/lh_config.de.1 b/manpages/lh_config.de.1 new file mode 100644 index 0000000..126f48b --- /dev/null +++ b/manpages/lh_config.de.1 @@ -0,0 +1,171 @@ +.TH LH_CONFIG 1 "13.08.2007" "1.0~a23" "live\-helper" + +.SH NAME +lh_config \- erstellt live-helper(7) Konfiguration + +.SH SYNTAX +.B lh_config [\fIlive\-helper\ Optionen\fR\|] + +.SH BESCHREIBUNG +lh_source ist ein Script um das Konfigurationsverzeichnis fuer live\-helper zu erstellen. Standardm\[:a]ssig wird das Konfigurationsverzeichnis 'config' genannt und im aktuellen Verzeichnis angelegt. + +.SH OPTIONEN +Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren Optionen f\[:u]r lh_config. +.IP "\fB\-\-apt\fR apt|aptitude" 4 + +.IP "\fB\-\-apt\-ftp\-proxy\fR \fIURL\fR" 4 + +.IP "\fB\-\-apt\-http\-proxy\fR \fIURL\fR" 4 + +.IP "\fB\-\-apt\-pdiffs\fR enabled|disabled" 4 + +.IP "\fB\-\-apt\-pipeline\fR FIXME" 4 + +.IP "\fB\-\-apt\-recommends\fR enabled|disabled" 4 + +.IP "\fB\-\-apt\-secure\fR enabled|disabled" 4 + +.IP "\fB\-a|\-\-architecture\fR \fIARCHITECTURE\fR" 4 + +.IP "\fB\-b|\-\-binary\-images\fR iso|net|tar|usb\-hdd" 4 + +.IP "\fB\-\-binary\-indices\fR enabled|disabled" 4 + +.IP "\fB\-\-bootappend\fR \fIPARAMETER\fR|""\fIPARAMETERS\fR""" 4 + +.IP "\fB\-\-bootloader\fR grub|syslinux|yaboot" 4 + +.IP "\fB\-\-bootstrap\fR cdebootstrap|debootstrap" 4 + +.IP "\fB\-\-bootstrap\-config\fR \fIFILE\fR" 4 + +.IP "\fB\-f|\-\-bootstrap\-flavour\fR minimal|standard" 4 + +.IP "\fB\-\-bootstrap\-keyring\fR \fIPACKAGE\fR" 4 + +.IP "\fB\-\-cache\fR enabled|disabled" 4 + +.IP "\fB\-\-cache\-indices\fR enabled|disabled" 4 + +.IP "\fB\-\-cache\-packages\fR enabled|disabled" 4 + +.IP "\fB\-\-cache\-stages\fR \fISTAGE\fR|""\fISTAGES\fR""" 4 + +.IP "\fB\-\-chroot\-build\fR enabled|disabled" 4 + +.IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|squashfs|plain" 4 + +.IP "\fB\-c|\-\-conffile\fR \fIFILE\fR" 4 + +.IP "\fB\-\-debconf\-frontend\fR dialog|editor|noninteractive|readline" 4 + +.IP "\fB\-\-debconf\-nowarnings\fR enabled|disabled" 4 + +.IP "\fB\-\-debconf\-priority\fR low|medium|high|critical" 4 + +.IP "\fB\-\-debian\-installer\fR enabled|disabled" 4 + +.IP "\fB\-d|\-\-distribution\fR \fICODENAME\fR" 4 + +.IP "\fB\-e|\-\-encryption\fR aes128|aes192|aes256" 4 + +.IP "\fB\-\-genisoimage\fR genisomage|mkisofs" 4 + +.IP "\fB\-\-grub\-splash\fR \fIFILE\fR" 4 + +.IP "\fB\-\-hooks\fR \fIFILE\fR" 4 + +.IP "\fB\-\-hostname\fR \fINAME\fR" 4 + +.IP "\fB\-\-includes\fR \fIPATH\fR" 4 + +.IP "\fB\-\-initramfs\fR auto|live\-initramfs|casper" 4 + +.IP "\fB\-\-interactive\fR shell" 4 + +.IP "\fB\-\-iso\-application\fR \fINAME\fR" 4 + +.IP "\fB\-\-iso\-preparer\fR \fINAME\fR" 4 + +.IP "\fB\-\-iso\-publisher\fR \fINAME\fR" 4 + +.IP "\fB\-\-iso\-volume\fR \fINAME\fR" 4 + +.IP "\fB\-\-keyring\-packages\fR \fIPACKAGE\fR|""\fIPACKAGES\fR""" 4 + +.IP "\fB\-l|\-\-language\fR \fILANGUAGE\fR" 4 + +.IP "\fB\-k|\-\-linux\-flavours\fR \fIFLAVOUR\fR|""\fIFLAVOURS\fR""" 4 + +.IP "\fB\-\-linux\-packages\fR \fIPACKAGE\fR|""\fIPACKGAGES\fR""" 4 + +.IP "\fB\-\-losetup\fR losetup|losetup.orig" 4 + +.IP "\fB\-\-memtest\fR memtest86+|memtest86" 4 + +.IP "\fB\-m|\-\-mirror\-binary\-security\fR \fIURL\fR" 4 + +.IP "\fB\-\-mirror\-binary\fR \fIURL\fR" 4 + +.IP "\fB\-\-mirror\-bootstrap\-security\fR \fIURL\fR" 4 + +.IP "\fB\-\-mirror\-bootstrap\fR \fIURL\fR" 4 + +.IP "\fB\-\-mode\fR debian|debian\-edu|ubuntu" 4 + +.IP "\fB\-\-net\-filesystem\fR nfs|cfs" 4 + +.IP "\fB\-\-net\-mountoptions\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4 + +.IP "\fB\-\-net\-path\fR \fIPATH\fR" 4 + +.IP "\fB\-\-net\\-server\fR \fIIP\fR|\fIHOSTNAME\fR" 4 + +.IP "\fB\-p|\-\-packages\-lists\fR \fIFILE\fR" 4 + +.IP "\fB\-\-packages\fR \fIPACKAGE\fR|""\fIPACKAGES\fR""" 4 + +.IP "\fB\-\-root\-command\fR sudo" 4 + +.IP "\fB\-\-sections\fR \fISECTION\fR|""\fISECTIONS\fR""" 4 + +.IP "\fB\-\-security\fR enabled|disabled" 4 + +.IP "\fB\-\-source\fR enabled|disabled" 4 + +.IP "\fB\-s|\-\-source\-images\fR iso|net|tar|usb\-hdd" 4 + +.IP "\fB\-\-symlinks\fR enabled|disabled" 4 + +.IP "\fB\-\-syslinux\-splash\fR \fIFILE\fR" 4 + +.IP "\fB\-\-syslinux\-timeout\fR \fIMILISECONDS\fR" 4 + +.IP "\fB\-\-sysvinit\fR enabled|disabled" 4 + +.IP "\fB\-\-tasksel\fR aptitude|tasksel" 4 + +.IP "\fB\-\-tasks\fR \fITASK\fR" 4 + +.IP "\fB\-\-templates\fR \fIPATH\fR" 4 + +.IP "\fB\-\-union\-filesystem\fR aufs|unionfs" 4 + +.IP "\fB\-\-username\fR \fINAME\fR" 4 + +.SH UMGEBUNG +Alle Kommandozeilenoptionen k\[:o]nnen auch durch die ensprechende Umgebungsvariable spezifiziert werden. Umgebungsvariablen sind LH_FOO geannt, das heisst, z.B. \-\-apt\-ftp\-proxy wird zu LH_APT_FTP_PROXY. + +.SH SIEHE AUCH +\fIlive\-helper\fR(7) +.PP +Dieses Programm ist Teil von live\-helper. + +.SH FEHLER +Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR> gemeldet werden. + +.SH HOMEPAGE +Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden. + +.SH AUTOR +live\-helper wurde von Daniel Baumann <\fIdaniel@debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben. diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1 new file mode 100644 index 0000000..1825ff1 --- /dev/null +++ b/manpages/lh_config.en.1 @@ -0,0 +1,171 @@ +.TH LH_CONFIG 1 "2007\-08\-13" "1.0~a23" "live\-helper" + +.SH NAME +lh_config \- create configuration for live-helper(7) + +.SH SYNOPSIS +.B lh_config [\fIlive\-helper\ options\fR\|] + +.SH DESCRIPTION +lh_source is a script to populate the configuration directory for live\-helper. By default, this directory is named 'config' and is created in the current directory. + +.SH OPTIONS +Here is the complete list of available options for lh_config. +.IP "\fB\-\-apt\fR apt|aptitude" 4 + +.IP "\fB\-\-apt\-ftp\-proxy\fR \fIURL\fR" 4 + +.IP "\fB\-\-apt\-http\-proxy\fR \fIURL\fR" 4 + +.IP "\fB\-\-apt\-pdiffs\fR enabled|disabled" 4 + +.IP "\fB\-\-apt\-pipeline\fR FIXME" 4 + +.IP "\fB\-\-apt\-recommends\fR enabled|disabled" 4 + +.IP "\fB\-\-apt\-secure\fR enabled|disabled" 4 + +.IP "\fB\-a|\-\-architecture\fR \fIARCHITECTURE\fR" 4 + +.IP "\fB\-b|\-\-binary\-images\fR iso|net|tar|usb\-hdd" 4 + +.IP "\fB\-\-binary\-indices\fR enabled|disabled" 4 + +.IP "\fB\-\-bootappend\fR \fIPARAMETER\fR|""\fIPARAMETERS\fR""" 4 + +.IP "\fB\-\-bootloader\fR grub|syslinux|yaboot" 4 + +.IP "\fB\-\-bootstrap\fR cdebootstrap|debootstrap" 4 + +.IP "\fB\-\-bootstrap\-config\fR \fIFILE\fR" 4 + +.IP "\fB\-f|\-\-bootstrap\-flavour\fR minimal|standard" 4 + +.IP "\fB\-\-bootstrap\-keyring\fR \fIPACKAGE\fR" 4 + +.IP "\fB\-\-cache\fR enabled|disabled" 4 + +.IP "\fB\-\-cache\-indices\fR enabled|disabled" 4 + +.IP "\fB\-\-cache\-packages\fR enabled|disabled" 4 + +.IP "\fB\-\-cache\-stages\fR \fISTAGE\fR|""\fISTAGES\fR""" 4 + +.IP "\fB\-\-chroot\-build\fR enabled|disabled" 4 + +.IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|squashfs|plain" 4 + +.IP "\fB\-c|\-\-conffile\fR \fIFILE\fR" 4 + +.IP "\fB\-\-debconf\-frontend\fR dialog|editor|noninteractive|readline" 4 + +.IP "\fB\-\-debconf\-nowarnings\fR enabled|disabled" 4 + +.IP "\fB\-\-debconf\-priority\fR low|medium|high|critical" 4 + +.IP "\fB\-\-debian\-installer\fR enabled|disabled" 4 + +.IP "\fB\-d|\-\-distribution\fR \fICODENAME\fR" 4 + +.IP "\fB\-e|\-\-encryption\fR aes128|aes192|aes256" 4 + +.IP "\fB\-\-genisoimage\fR genisomage|mkisofs" 4 + +.IP "\fB\-\-grub\-splash\fR \fIFILE\fR" 4 + +.IP "\fB\-\-hooks\fR \fIFILE\fR" 4 + +.IP "\fB\-\-hostname\fR \fINAME\fR" 4 + +.IP "\fB\-\-includes\fR \fIPATH\fR" 4 + +.IP "\fB\-\-initramfs\fR auto|live\-initramfs|casper" 4 + +.IP "\fB\-\-interactive\fR shell" 4 + +.IP "\fB\-\-iso\-application\fR \fINAME\fR" 4 + +.IP "\fB\-\-iso\-preparer\fR \fINAME\fR" 4 + +.IP "\fB\-\-iso\-publisher\fR \fINAME\fR" 4 + +.IP "\fB\-\-iso\-volume\fR \fINAME\fR" 4 + +.IP "\fB\-\-keyring\-packages\fR \fIPACKAGE\fR|""\fIPACKAGES\fR""" 4 + +.IP "\fB\-l|\-\-language\fR \fILANGUAGE\fR" 4 + +.IP "\fB\-k|\-\-linux\-flavours\fR \fIFLAVOUR\fR|""\fIFLAVOURS\fR""" 4 + +.IP "\fB\-\-linux\-packages\fR \fIPACKAGE\fR|""\fIPACKGAGES\fR""" 4 + +.IP "\fB\-\-losetup\fR losetup|losetup.orig" 4 + +.IP "\fB\-\-memtest\fR memtest86+|memtest86" 4 + +.IP "\fB\-m|\-\-mirror\-binary\-security\fR \fIURL\fR" 4 + +.IP "\fB\-\-mirror\-binary\fR \fIURL\fR" 4 + +.IP "\fB\-\-mirror\-bootstrap\-security\fR \fIURL\fR" 4 + +.IP "\fB\-\-mirror\-bootstrap\fR \fIURL\fR" 4 + +.IP "\fB\-\-mode\fR debian|debian\-edu|ubuntu" 4 + +.IP "\fB\-\-net\-filesystem\fR nfs|cfs" 4 + +.IP "\fB\-\-net\-mountoptions\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4 + +.IP "\fB\-\-net\-path\fR \fIPATH\fR" 4 + +.IP "\fB\-\-net\\-server\fR \fIIP\fR|\fIHOSTNAME\fR" 4 + +.IP "\fB\-p|\-\-packages\-lists\fR \fIFILE\fR" 4 + +.IP "\fB\-\-packages\fR \fIPACKAGE\fR|""\fIPACKAGES\fR""" 4 + +.IP "\fB\-\-root\-command\fR sudo" 4 + +.IP "\fB\-\-sections\fR \fISECTION\fR|""\fISECTIONS\fR""" 4 + +.IP "\fB\-\-security\fR enabled|disabled" 4 + +.IP "\fB\-\-source\fR enabled|disabled" 4 + +.IP "\fB\-s|\-\-source\-images\fR iso|net|tar|usb\-hdd" 4 + +.IP "\fB\-\-symlinks\fR enabled|disabled" 4 + +.IP "\fB\-\-syslinux\-splash\fR \fIFILE\fR" 4 + +.IP "\fB\-\-syslinux\-timeout\fR \fIMILISECONDS\fR" 4 + +.IP "\fB\-\-sysvinit\fR enabled|disabled" 4 + +.IP "\fB\-\-tasksel\fR aptitude|tasksel" 4 + +.IP "\fB\-\-tasks\fR \fITASK\fR" 4 + +.IP "\fB\-\-templates\fR \fIPATH\fR" 4 + +.IP "\fB\-\-union\-filesystem\fR aufs|unionfs" 4 + +.IP "\fB\-\-username\fR \fINAME\fR" 4 + +.SH ENVIRONMENT +All command line switches can also be specified through the corresponding environment variable. Environment variables are name LH_FOO, means, e.g. \-\-apt\-ftp\-proxy becomes LH_APT_FTP_PROXY. + +.SH SEE ALSO +\fIlive\-helper\fR(7) +.PP +This program is a part of live\-helper. + +.SH BUGS +Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper\fR>. + +.SH HOMEPAGE +More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>. + +.SH AUTHOR +live\-helper was written by Daniel Baumann <\fIdaniel@debian.org\fR> for the Debian project. diff --git a/manpages/lh_source.de.1 b/manpages/lh_source.de.1 index 261df0e..c819d3f 100644 --- a/manpages/lh_source.de.1 +++ b/manpages/lh_source.de.1 @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "06.08.2007" "1.0~a22" "live\-helper" +.TH LH_SOURCE 1 "13.08.2007" "1.0~a23" "live\-helper" .SH NAME lh_source \- Meta\-Helper f\[:u]r lh_source_* diff --git a/manpages/lh_source.en.1 b/manpages/lh_source.en.1 index f53f20a..e39090d 100644 --- a/manpages/lh_source.en.1 +++ b/manpages/lh_source.en.1 @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "2007\-08\-06" "1.0~a22" "live\-helper" +.TH LH_SOURCE 1 "2007\-08\-13" "1.0~a23" "live\-helper" .SH NAME lh_source \- meta\-helper for lh_source_* diff --git a/manpages/lh_testroot.de.1 b/manpages/lh_testroot.de.1 index 5868395..5701951 100644 --- a/manpages/lh_testroot.de.1 +++ b/manpages/lh_testroot.de.1 @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "06.08.2007" "1.0~a22" "live\-helper" +.TH LH_TESTROOT 1 "13.08.2007" "1.0~a23" "live\-helper" .SH NAME lh_testroot \- stellt sicher dass das System als root gebaut wird diff --git a/manpages/lh_testroot.en.1 b/manpages/lh_testroot.en.1 index f92857a..8ce9ec6 100644 --- a/manpages/lh_testroot.en.1 +++ b/manpages/lh_testroot.en.1 @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "2007\-08\-06" "1.0~a22" "live\-helper" +.TH LH_TESTROOT 1 "2007\-08\-13" "1.0~a23" "live\-helper" .SH NAME lh_testroot \- ensure that a system is built as root diff --git a/manpages/live-helper.de.7 b/manpages/live-helper.de.7 index e996a25..08f17a6 100644 --- a/manpages/live-helper.de.7 +++ b/manpages/live-helper.de.7 @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "06.08.2007" "1.0~a22" "live\-helper" +.TH LIVE\-HELPER 7 "13.08.2007" "1.0~a23" "live\-helper" .SH NAME live\-helper \- Debian Live Helper-Programme @@ -150,8 +150,6 @@ zeigt Debug Informationen. erzwingt Helper Ausf\[:u]hrung, auch wenn Stage-Datei existiert. .IP "\fB\-h, \-\-help\fR" 4 zeigt Hilfe Informationen und stoppt. -.IP "\fB\-\-logfile\fR" 4 -benutzen von eigener Log-Datei. .IP "\fB\-\-quiet\fR" 4 still .IP "\fB\-u, \-\-usage\fR" 4 diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7 index 23f68e1..bdb22bf 100644 --- a/manpages/live-helper.en.7 +++ b/manpages/live-helper.en.7 @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "2007\-08\-06" "1.0~a22" "live\-helper" +.TH LIVE\-HELPER 7 "2007\-08\-13" "1.0~a23" "live\-helper" .SH NAME live\-helper \- Debian Live helper programs @@ -148,8 +148,6 @@ show debug information force helper execution, even if stage file exists. .IP "\fB\-h, \-\-help\fR" 4 display help and exit -.IP "\fB\-\-logfile\fR" 4 -use custom log file .IP "\fB\-\-quiet\fR" 4 be quiet .IP "\fB\-u, \-\-usage\fR" 4 |