[SCM] live-helper branch, upstream, updated. upstream/2.0_a6-2-gc17acf5
Daniel Baumann
daniel at debian.org
Wed Feb 17 11:53:33 UTC 2010
The following commit has been merged in the upstream branch:
commit 5efe42d6a98c6208d74141f464441d72d2793948
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Feb 17 12:35:20 2010 +0100
Adding upstream version 2.0~a7.
diff --git a/examples/cron/images.sh b/examples/cron/images.sh
index d0edfc0..9bd85b4 100755
--- a/examples/cron/images.sh
+++ b/examples/cron/images.sh
@@ -5,8 +5,8 @@ DISTRIBUTIONS="${DISTRIBUTIONS:-lenny squeeze sid}"
FLAVOURS="${FLAVOURS:-standard rescue gnome-desktop kde-desktop lxde-desktop xfce-desktop}"
SOURCE="${SOURCE:-true}"
-MIRROR="${MIRROR:-http://mirror/ftp.debian.org/debian/}"
-MIRROR_SECURITY="${MIRROR_SECURITY:-http://mirror/ftp.debian.org/debian-security/}"
+MIRROR="${MIRROR:-http://cdn.debian.net/debian/}"
+MIRROR_SECURITY="${MIRROR_SECURITY:-http://security.debian.org/}"
# Dynamic variables
ARCHITECTURE="$(dpkg --print-architecture)"
diff --git a/functions/chroot.sh b/functions/chroot.sh
index e3af0c2..ba93bf7 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -17,10 +17,10 @@ Chroot ()
if [ "${LH_USE_FAKEROOT}" != "true" ]
then
- ${LH_ROOT_COMMAND} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTP_PROXY}" http_proxy="${LH_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS}
+ ${LH_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTP_PROXY}" http_proxy="${LH_APT_HTTP_PROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS}
else
# Building with fakeroot/fakechroot
- ${LH_ROOT_COMMAND} chroot "${CHROOT}" ${COMMANDS}
+ ${LH_ROOT_COMMAND} /usr/sbin/chroot "${CHROOT}" ${COMMANDS}
fi
return "${?}"
diff --git a/functions/common.sh b/functions/common.sh
index 72fdf5b..b7a8417 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -9,7 +9,7 @@
PROGRAM="$(basename ${0})"
PACKAGE="live-helper"
-VERSION="2.0~a4-1"
+VERSION="2.0~a7-1"
CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
PATH="${PWD}/auto/helpers:${PATH}"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index f52578f..13399c3 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -782,7 +782,10 @@ Set_defaults ()
if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]
then
# Try USB block devices for install media
- LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LH_BOOTAPPEND_INSTALL}"
+ if ! echo "${LH_BOOTAPPEND_INSTALL}" | grep -q try-usb
+ then
+ LH_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true ${LH_BOOTAPPEND_INSTALL}"
+ fi
fi
if [ -n ${_LH_BOOTAPPEND_PRESEED} ]
@@ -795,6 +798,8 @@ Set_defaults ()
LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL} -- \${LH_BOOTAPPEND_LIVE}"
fi
+ LH_BOOTAPPEND_INSTALL="$(echo ${LH_BOOTAPPEND_INSTALL} | sed -e 's/[ \t]*$//')"
+
# Setting encryption
LH_ENCRYPTION="${LH_ENCRYPTION:-false}"
diff --git a/helpers/lh_binary b/helpers/binary
similarity index 100%
rename from helpers/lh_binary
rename to helpers/binary
diff --git a/helpers/lh_binary_chroot b/helpers/binary_chroot
similarity index 100%
rename from helpers/lh_binary_chroot
rename to helpers/binary_chroot
diff --git a/helpers/lh_binary_debian-installer b/helpers/binary_debian-installer
similarity index 100%
rename from helpers/lh_binary_debian-installer
rename to helpers/binary_debian-installer
diff --git a/helpers/lh_binary_disk b/helpers/binary_disk
similarity index 100%
rename from helpers/lh_binary_disk
rename to helpers/binary_disk
diff --git a/helpers/lh_binary_encryption b/helpers/binary_encryption
similarity index 100%
rename from helpers/lh_binary_encryption
rename to helpers/binary_encryption
diff --git a/helpers/lh_binary_grub b/helpers/binary_grub
similarity index 100%
rename from helpers/lh_binary_grub
rename to helpers/binary_grub
diff --git a/helpers/lh_binary_grub2 b/helpers/binary_grub2
similarity index 100%
rename from helpers/lh_binary_grub2
rename to helpers/binary_grub2
diff --git a/helpers/lh_binary_includes b/helpers/binary_includes
similarity index 100%
rename from helpers/lh_binary_includes
rename to helpers/binary_includes
diff --git a/helpers/lh_binary_iso b/helpers/binary_iso
similarity index 100%
rename from helpers/lh_binary_iso
rename to helpers/binary_iso
diff --git a/helpers/lh_binary_linux-image b/helpers/binary_linux-image
similarity index 100%
rename from helpers/lh_binary_linux-image
rename to helpers/binary_linux-image
diff --git a/helpers/lh_binary_local-hooks b/helpers/binary_local-hooks
similarity index 100%
rename from helpers/lh_binary_local-hooks
rename to helpers/binary_local-hooks
diff --git a/helpers/lh_binary_local-includes b/helpers/binary_local-includes
similarity index 100%
rename from helpers/lh_binary_local-includes
rename to helpers/binary_local-includes
diff --git a/helpers/lh_binary_local-packageslists b/helpers/binary_local-packageslists
similarity index 100%
rename from helpers/lh_binary_local-packageslists
rename to helpers/binary_local-packageslists
diff --git a/helpers/lh_binary_manifest b/helpers/binary_manifest
similarity index 100%
rename from helpers/lh_binary_manifest
rename to helpers/binary_manifest
diff --git a/helpers/lh_binary_md5sum b/helpers/binary_md5sum
similarity index 100%
rename from helpers/lh_binary_md5sum
rename to helpers/binary_md5sum
diff --git a/helpers/lh_binary_memtest b/helpers/binary_memtest
similarity index 100%
rename from helpers/lh_binary_memtest
rename to helpers/binary_memtest
diff --git a/helpers/lh_binary_net b/helpers/binary_net
similarity index 100%
rename from helpers/lh_binary_net
rename to helpers/binary_net
diff --git a/helpers/lh_binary_rootfs b/helpers/binary_rootfs
similarity index 100%
rename from helpers/lh_binary_rootfs
rename to helpers/binary_rootfs
diff --git a/helpers/lh_binary_silo b/helpers/binary_silo
similarity index 100%
rename from helpers/lh_binary_silo
rename to helpers/binary_silo
diff --git a/helpers/lh_binary_syslinux b/helpers/binary_syslinux
similarity index 99%
rename from helpers/lh_binary_syslinux
rename to helpers/binary_syslinux
index ee1d961..ba7f9d5 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/binary_syslinux
@@ -199,7 +199,7 @@ Copy_syslinux_templates ()
case "${LH_SYSLINUX_MENU}" in
gfxboot)
- # to be implemented
+ MENUMODULE="gfxboot.c32"
;;
menu)
@@ -277,7 +277,7 @@ Copy_syslinux_templates ()
rm -f ${SCREEN_PATH}/*.install*
fi
- if [ "${LH_SYSLINUX_MENU}" = "true" ]
+ if [ "${LH_SYSLINUX_MENU}" != "false" ]
then
rm -f ${DATA_PATH}/boot.txt
fi
diff --git a/helpers/lh_binary_tar b/helpers/binary_tar
similarity index 100%
rename from helpers/lh_binary_tar
rename to helpers/binary_tar
diff --git a/helpers/lh_binary_usb-hdd b/helpers/binary_usb-hdd
similarity index 100%
rename from helpers/lh_binary_usb-hdd
rename to helpers/binary_usb-hdd
diff --git a/helpers/lh_binary_virtual-hdd b/helpers/binary_virtual-hdd
similarity index 100%
rename from helpers/lh_binary_virtual-hdd
rename to helpers/binary_virtual-hdd
diff --git a/helpers/lh_binary_win32-loader b/helpers/binary_win32-loader
similarity index 100%
rename from helpers/lh_binary_win32-loader
rename to helpers/binary_win32-loader
diff --git a/helpers/lh_binary_yaboot b/helpers/binary_yaboot
similarity index 100%
rename from helpers/lh_binary_yaboot
rename to helpers/binary_yaboot
diff --git a/helpers/lh_bootstrap b/helpers/bootstrap
similarity index 100%
rename from helpers/lh_bootstrap
rename to helpers/bootstrap
diff --git a/helpers/lh_bootstrap_cache b/helpers/bootstrap_cache
similarity index 100%
rename from helpers/lh_bootstrap_cache
rename to helpers/bootstrap_cache
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/bootstrap_cdebootstrap
similarity index 100%
rename from helpers/lh_bootstrap_cdebootstrap
rename to helpers/bootstrap_cdebootstrap
diff --git a/helpers/lh_bootstrap_copy b/helpers/bootstrap_copy
similarity index 100%
rename from helpers/lh_bootstrap_copy
rename to helpers/bootstrap_copy
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/bootstrap_debootstrap
similarity index 100%
rename from helpers/lh_bootstrap_debootstrap
rename to helpers/bootstrap_debootstrap
diff --git a/helpers/lh_build b/helpers/build
similarity index 100%
rename from helpers/lh_build
rename to helpers/build
diff --git a/helpers/lh_chroot b/helpers/chroot
similarity index 100%
rename from helpers/lh_chroot
rename to helpers/chroot
diff --git a/helpers/lh_chroot_apt b/helpers/chroot_apt
similarity index 100%
rename from helpers/lh_chroot_apt
rename to helpers/chroot_apt
diff --git a/helpers/lh_chroot_cache b/helpers/chroot_cache
similarity index 100%
rename from helpers/lh_chroot_cache
rename to helpers/chroot_cache
diff --git a/helpers/lh_chroot_debianchroot b/helpers/chroot_debianchroot
similarity index 100%
rename from helpers/lh_chroot_debianchroot
rename to helpers/chroot_debianchroot
diff --git a/helpers/lh_chroot_devpts b/helpers/chroot_devpts
similarity index 100%
rename from helpers/lh_chroot_devpts
rename to helpers/chroot_devpts
diff --git a/helpers/lh_chroot_dpkg b/helpers/chroot_dpkg
similarity index 100%
rename from helpers/lh_chroot_dpkg
rename to helpers/chroot_dpkg
diff --git a/helpers/lh_chroot_hacks b/helpers/chroot_hacks
similarity index 100%
rename from helpers/lh_chroot_hacks
rename to helpers/chroot_hacks
diff --git a/helpers/lh_chroot_hooks b/helpers/chroot_hooks
similarity index 100%
rename from helpers/lh_chroot_hooks
rename to helpers/chroot_hooks
diff --git a/helpers/lh_chroot_hostname b/helpers/chroot_hostname
similarity index 100%
rename from helpers/lh_chroot_hostname
rename to helpers/chroot_hostname
diff --git a/helpers/lh_chroot_hosts b/helpers/chroot_hosts
similarity index 100%
rename from helpers/lh_chroot_hosts
rename to helpers/chroot_hosts
diff --git a/helpers/lh_chroot_install-packages b/helpers/chroot_install-packages
similarity index 100%
rename from helpers/lh_chroot_install-packages
rename to helpers/chroot_install-packages
diff --git a/helpers/lh_chroot_interactive b/helpers/chroot_interactive
similarity index 100%
rename from helpers/lh_chroot_interactive
rename to helpers/chroot_interactive
diff --git a/helpers/lh_chroot_linux-image b/helpers/chroot_linux-image
similarity index 100%
rename from helpers/lh_chroot_linux-image
rename to helpers/chroot_linux-image
diff --git a/helpers/lh_chroot_local-hooks b/helpers/chroot_local-hooks
similarity index 100%
rename from helpers/lh_chroot_local-hooks
rename to helpers/chroot_local-hooks
diff --git a/helpers/lh_chroot_local-includes b/helpers/chroot_local-includes
similarity index 100%
rename from helpers/lh_chroot_local-includes
rename to helpers/chroot_local-includes
diff --git a/helpers/lh_chroot_local-packages b/helpers/chroot_local-packages
similarity index 100%
rename from helpers/lh_chroot_local-packages
rename to helpers/chroot_local-packages
diff --git a/helpers/lh_chroot_local-packageslists b/helpers/chroot_local-packageslists
similarity index 100%
rename from helpers/lh_chroot_local-packageslists
rename to helpers/chroot_local-packageslists
diff --git a/helpers/lh_chroot_local-patches b/helpers/chroot_local-patches
similarity index 100%
rename from helpers/lh_chroot_local-patches
rename to helpers/chroot_local-patches
diff --git a/helpers/lh_chroot_local-preseed b/helpers/chroot_local-preseed
similarity index 100%
rename from helpers/lh_chroot_local-preseed
rename to helpers/chroot_local-preseed
diff --git a/helpers/lh_chroot_localization b/helpers/chroot_localization
similarity index 100%
rename from helpers/lh_chroot_localization
rename to helpers/chroot_localization
diff --git a/helpers/lh_chroot_packages b/helpers/chroot_packages
similarity index 100%
rename from helpers/lh_chroot_packages
rename to helpers/chroot_packages
diff --git a/helpers/lh_chroot_packageslists b/helpers/chroot_packageslists
similarity index 100%
rename from helpers/lh_chroot_packageslists
rename to helpers/chroot_packageslists
diff --git a/helpers/lh_chroot_preseed b/helpers/chroot_preseed
similarity index 100%
rename from helpers/lh_chroot_preseed
rename to helpers/chroot_preseed
diff --git a/helpers/lh_chroot_proc b/helpers/chroot_proc
similarity index 100%
rename from helpers/lh_chroot_proc
rename to helpers/chroot_proc
diff --git a/helpers/lh_chroot_resolv b/helpers/chroot_resolv
similarity index 100%
rename from helpers/lh_chroot_resolv
rename to helpers/chroot_resolv
diff --git a/helpers/lh_chroot_selinuxfs b/helpers/chroot_selinuxfs
similarity index 100%
rename from helpers/lh_chroot_selinuxfs
rename to helpers/chroot_selinuxfs
diff --git a/helpers/lh_chroot_sources b/helpers/chroot_sources
similarity index 81%
rename from helpers/lh_chroot_sources
rename to helpers/chroot_sources
index 8b3682e..6edc3ac 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/chroot_sources
@@ -218,10 +218,8 @@ case "${1}" in
fi
fi
- # Add to sources.list
- echo "" >> chroot/etc/apt/sources.list
- echo "# Local packages" >> chroot/etc/apt/sources.list
- echo "deb file:/root/local-packages ./" >> chroot/etc/apt/sources.list
+ # Add to sources.list.d
+ echo "deb file:/root/local-packages ./" > chroot/etc/apt/sources.list.d/local-packages.list
# Removing depends
Remove_package
@@ -355,102 +353,100 @@ case "${1}" in
Create_lockfile .lock
# Configure generic indices
- if [ "${LH_BINARY_INDICES}" = "true" ]
+ # Don't do anything if it's not required
+ if [ "${LH_MIRROR_CHROOT}" = "${LH_MIRROR_BINARY}" ] && \
+ [ "${LH_MIRROR_CHROOT_SECURITY}" = "${LH_MIRROR_BINARY_SECURITY}" ] && \
+ [ ! -d chroot/root/local-packages ]
then
- # Don't do anything if it's not required
- if [ "${LH_MIRROR_CHROOT}" = "${LH_MIRROR_BINARY}" ] && \
- [ "${LH_MIRROR_CHROOT_SECURITY}" = "${LH_MIRROR_BINARY_SECURITY}" ] && \
- [ ! -d chroot/root/local-packages ]
- then
- # Removing stage file
- rm -f .stage/chroot_sources
+ # Removing stage file
+ rm -f .stage/chroot_sources
- exit 0
- fi
+ exit 0
+ fi
- # Cleaning apt list cache
- rm -rf chroot/var/lib/apt/lists
- mkdir -p chroot/var/lib/apt/lists/partial
+ # Cleaning apt list cache
+ rm -rf chroot/var/lib/apt/lists
+ mkdir -p chroot/var/lib/apt/lists/partial
- echo "deb ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
+ echo "deb ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
- then
- echo "deb-src ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- fi
+ if [ "${LH_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ fi
- if [ "${LH_SECURITY}" = "true" ]
- then
- case "${LH_MODE}" in
- ubuntu)
- echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ if [ "${LH_SECURITY}" = "true" ]
+ then
+ case "${LH_MODE}" in
+ ubuntu)
+ echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
- then
- echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- fi
- ;;
+ if [ "${LH_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ fi
+ ;;
- *)
- if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
- then
- echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ *)
+ if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+ then
+ echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- if [ "${LH_SOURCE}" = "true" ]
- then
- echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
- fi
+ if [ "${LH_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
- ;;
- esac
- fi
+ fi
+ ;;
+ esac
+ fi
- # Check local sources.list
- if Find_files config/chroot_sources/*.binary
+ # Check local sources.list
+ if Find_files config/chroot_sources/*.binary
+ then
+ # Deconfigure (possibly) old sources.list snipplets
+ if Find_files config/chroot_sources/*.chroot
then
- # Deconfigure (possibly) old sources.list snipplets
- if Find_files config/chroot_sources/*.chroot
- then
- for FILE in config/chroot_sources/*.chroot
- do
- rm -f "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot).list"
- done
- fi
-
- # Configure new sources.list snipplets
- for FILE in config/chroot_sources/*.binary
+ for FILE in config/chroot_sources/*.chroot
do
- cp "${FILE}" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary).list"
+ rm -f "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot).list"
done
fi
- # Check local gpg keys
- if Find_files config/chroot_sources/*.binary.gpg
- then
- for FILE in config/chroot_sources/*.binary.gpg
- do
- cp ${FILE} chroot/root
- Chroot chroot "apt-key add /root/$(basename ${FILE})"
- rm -f chroot/root/$(basename ${FILE})
- done
- fi
+ # Configure new sources.list snipplets
+ for FILE in config/chroot_sources/*.binary
+ do
+ cp "${FILE}" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary).list"
+ done
+ fi
- # Updating indices
- Apt update
+ # Check local gpg keys
+ if Find_files config/chroot_sources/*.binary.gpg
+ then
+ for FILE in config/chroot_sources/*.binary.gpg
+ do
+ cp ${FILE} chroot/root
+ Chroot chroot "apt-key add /root/$(basename ${FILE})"
+ rm -f chroot/root/$(basename ${FILE})
+ done
fi
+ # Updating indices
+ Apt update
+
# Cleaning apt package cache
rm -rf chroot/var/cache/apt
mkdir -p chroot/var/cache/apt/archives/partial
# Cleaning apt package lists
- if [ "${LH_BINARY_INDICES}" = "none" ]
+ if [ "${LH_BINARY_INDICES}" = "false" ]
then
rm -rf chroot/var/lib/apt/lists
mkdir -p chroot/var/lib/apt/lists/partial
fi
# Remove local package repository
+ rm -f chroot/etc/apt/sources.list.d/local-packages.list
rm -rf chroot/root/local-packages
# Remove local packages key if it exists
diff --git a/helpers/lh_chroot_symlinks b/helpers/chroot_symlinks
similarity index 100%
rename from helpers/lh_chroot_symlinks
rename to helpers/chroot_symlinks
diff --git a/helpers/lh_chroot_sysfs b/helpers/chroot_sysfs
similarity index 100%
rename from helpers/lh_chroot_sysfs
rename to helpers/chroot_sysfs
diff --git a/helpers/lh_chroot_sysv-rc b/helpers/chroot_sysv-rc
similarity index 100%
rename from helpers/lh_chroot_sysv-rc
rename to helpers/chroot_sysv-rc
diff --git a/helpers/lh_chroot_sysvinit b/helpers/chroot_sysvinit
similarity index 100%
rename from helpers/lh_chroot_sysvinit
rename to helpers/chroot_sysvinit
diff --git a/helpers/lh_chroot_tasks b/helpers/chroot_tasks
similarity index 100%
rename from helpers/lh_chroot_tasks
rename to helpers/chroot_tasks
diff --git a/helpers/lh_clean b/helpers/clean
similarity index 100%
rename from helpers/lh_clean
rename to helpers/clean
diff --git a/helpers/lh_config b/helpers/config
similarity index 99%
rename from helpers/lh_config
rename to helpers/config
index 83a8242..2d7903c 100755
--- a/helpers/lh_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/helpers/lh b/helpers/lh
index ecf9b4a..8ab9de2 100755
--- a/helpers/lh
+++ b/helpers/lh
@@ -34,12 +34,15 @@ case "${1}" in
COMMAND="${1}"
shift
- if [ -x /usr/share/live-helper/helpers/lh_${COMMAND} ]
+ if [ -x "${LH_BASE}/helpers/${COMMAND}" ]
then
- LH=1 exec /usr/share/live-helper/helpers/lh_"${COMMAND}" "${@}"
- elif [ -x "$(which lh_${COMMAND} 2>/dev/null)" ]
+ LH=1 exec "${LH_BASE}/helpers/${COMMAND}" "${@}"
+ elif [ -x /usr/share/live-helper/helpers/${COMMAND} ]
then
- LH=1 exec lh_"${COMMAND}" "${@}"
+ LH=1 exec /usr/share/live-helper/helpers/"${COMMAND}" "${@}"
+ elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
+ then
+ LH=1 exec "${COMMAND}" "${@}"
else
Echo_error "no such helper"
exit 1
diff --git a/helpers/lh_local b/helpers/local
similarity index 100%
rename from helpers/lh_local
rename to helpers/local
diff --git a/helpers/lh_source b/helpers/source
similarity index 100%
rename from helpers/lh_source
rename to helpers/source
diff --git a/helpers/lh_source_debian b/helpers/source_debian
similarity index 100%
rename from helpers/lh_source_debian
rename to helpers/source_debian
diff --git a/helpers/lh_source_debian-live b/helpers/source_debian-live
similarity index 100%
rename from helpers/lh_source_debian-live
rename to helpers/source_debian-live
diff --git a/helpers/lh_source_disk b/helpers/source_disk
similarity index 100%
rename from helpers/lh_source_disk
rename to helpers/source_disk
diff --git a/helpers/lh_source_iso b/helpers/source_iso
similarity index 100%
rename from helpers/lh_source_iso
rename to helpers/source_iso
diff --git a/helpers/lh_source_md5sum b/helpers/source_md5sum
similarity index 100%
rename from helpers/lh_source_md5sum
rename to helpers/source_md5sum
diff --git a/helpers/lh_source_net b/helpers/source_net
similarity index 100%
rename from helpers/lh_source_net
rename to helpers/source_net
diff --git a/helpers/lh_source_tar b/helpers/source_tar
similarity index 100%
rename from helpers/lh_source_tar
rename to helpers/source_tar
diff --git a/helpers/lh_source_usb-hdd b/helpers/source_usb-hdd
similarity index 100%
rename from helpers/lh_source_usb-hdd
rename to helpers/source_usb-hdd
diff --git a/helpers/lh_source_virtual-hdd b/helpers/source_virtual-hdd
similarity index 100%
rename from helpers/lh_source_virtual-hdd
rename to helpers/source_virtual-hdd
diff --git a/helpers/lh_testroot b/helpers/testroot
similarity index 100%
rename from helpers/lh_testroot
rename to helpers/testroot
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index a38d368..df47d9d 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
@@ -323,7 +317,7 @@ sets the keyring package or additional keyring packages. By default this is set
.IP "\-l|\fB\-\-language\fR \fILANGUAGE\fR" 4
sets the language of a live system by installing l10n related packages and enables generation of the correct locales through automatically setting the right boot parameters.
.IP "\-k|\fB\-\-linux\-flavours\fR \fIFLAVOUR\fR|\fI"FLAVOURS"\fR" 4
-sets the kernel flavours to be installed. Note that in case you specify more than that the first will be configured the default kernel that gets bootet.
+sets the kernel flavours to be installed. Note that in case you specify more than that the first will be configured the default kernel that gets booted.
.IP "\fB\-\-linux\-packages\fR \fI"PACKAGES"\fR" 4
sets the internal name of the kernel packages naming scheme. If you use debian kernel packages, you will not have to adjust it. If you decide to use custom kernel packages that do not follow the debian naming scheme, remember to set this option to the stub of the packages only (for debian this is linux-image-2.6), so that \fISTUB\fR-\fIFLAVOUR\fR results in a valid package name (for debian e.g. linux-image-2.6-486). Preferably you use the meta package name, if any, for the stub, so that your configuration is ABI independent. Also don't forget that you have to include stubs of the binary modules packages for unionfs or aufs, and squashfs if you built them out-of-tree.
.IP "\fB\-\-losetup\fR losetup|losetup.orig" 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
More information about the debian-live-changes
mailing list