[Debian-live-changes] r1737 - in dists/trunk/live-helper: docs functions helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Fri May 25 14:59:08 UTC 2007
Author: daniel
Date: 2007-05-25 14:59:08 +0000 (Fri, 25 May 2007)
New Revision: 1737
Modified:
dists/trunk/live-helper/docs/ChangeLog
dists/trunk/live-helper/docs/TODO
dists/trunk/live-helper/functions/defaults.sh
dists/trunk/live-helper/helpers/lh_binary_iso
dists/trunk/live-helper/helpers/lh_config
dists/trunk/live-helper/helpers/lh_source_iso
Log:
Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog 2007-05-25 09:47:19 UTC (rev 1736)
+++ dists/trunk/live-helper/docs/ChangeLog 2007-05-25 14:59:08 UTC (rev 1737)
@@ -1,3 +1,11 @@
+2007-05-25 Daniel Baumann <daniel at debian.org>
+
+ * functions/defaults.sh:
+ - Updated check for LH_BOOTSTRAP on ubuntu.
+ * helpers/lh_binary_iso, lh_source_iso:
+ - Added configuration support for ISO application, preparer and
+ publisher field.
+
2007-05-24 Daniel Baumann <daniel at debian.org>
* helpers/lh_binary_syslinux:
Modified: dists/trunk/live-helper/docs/TODO
===================================================================
--- dists/trunk/live-helper/docs/TODO 2007-05-25 09:47:19 UTC (rev 1736)
+++ dists/trunk/live-helper/docs/TODO 2007-05-25 14:59:08 UTC (rev 1737)
@@ -4,9 +4,6 @@
This file lists only outstanding tasks. Any additions/comments/questions and
help is welcome. Write to <debian-live-devel at lists.alioth.debian.org>.
-1.0~a12-1:
- * reordering content of configuration files
-
ALPHA series:
FIXME
@@ -16,7 +13,7 @@
* yaboot (powerpc) boot support
* grub (i386/amd64) boot support on usb* binary images
* grub (i386/amd64) boot support on net binary images
- * multi-binary builds in one shot
+ * multi-{binary,architecture,distribution} builds in one shot
* vmlinu[xz]
* breakpoints (yes/no/all/type: soft ->interaction to stop/hard ->interaction to continue)
* check unset variables
Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh 2007-05-25 09:47:19 UTC (rev 1736)
+++ dists/trunk/live-helper/functions/defaults.sh 2007-05-25 14:59:08 UTC (rev 1737)
@@ -60,12 +60,6 @@
fi
fi
- # Setting apt indices
- if [ -z "${LIVE_BINARY_INDICES}" ]
- then
- LIVE_BINARY_INDICES="enabled"
- fi
-
# Setting apt pdiffs
if [ -z "${LH_APT_PDIFFS}" ]
then
@@ -102,17 +96,14 @@
;;
ubuntu)
- if [ -x "/usr/sbin/debootstrap" ]
+ if [ -x "/usr/bin/cdebootstrap" ] && [ -d /usr/share/cdebootstrap/generic-ubuntu ]
then
- if [ -f /usr/lib/debootstrap/scripts/feisty ]
- then
- LH_BOOTSTRAP="debootstrap"
- else
- echo "E: Your version of debootstrap does not support ubuntu."
- exit 1
- fi
+ LH_BOOTSTRAP="cdebootstrap"
+ elif [ -x "/usr/sbin/debootstrap" ] && [ -f /usr/lib/debootstrap/scripts/feisty ]
+ then
+ LH_BOOTSTRAP="debootstrap"
else
- echo "E: You need to install debootstrap from Ubuntu in order to bootstrap ubuntu."
+ echo "E: Your version of debootstrap or cdebootstrap is outdated and does not support ubuntu."
exit 1
fi
;;
@@ -141,14 +132,14 @@
LH_DEBCONF_FRONTEND="noninteractive"
fi
- if [ -z "${LH_DEBCONF_PRIORITY}" ]
+ if [ -z "${LH_DEBCONF_NOWARNINGS}" ]
then
- LH_DEBCONF_PRIORITY="critical"
+ LH_DEBCONF_NOWARNINGS="yes"
fi
- if [ -z "${LH_DEBCONF_NOWARNINGS}" ]
+ if [ -z "${LH_DEBCONF_PRIORITY}" ]
then
- LH_DEBCONF_NOWARNINGS="yes"
+ LH_DEBCONF_PRIORITY="critical"
fi
# Setting genisoimage
@@ -165,10 +156,21 @@
esac
fi
+ # Setting initramfs hook
+ if [ -z "${LH_INITRAMFS}" ]
+ then
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+ then
+ LH_INITRAMFS="casper"
+ else
+ LH_INITRAMFS="live-initramfs"
+ fi
+ fi
+
# Setting losetup
if [ -z "${LH_LOSETUP}" ] || [ ! -x "${LH_LOSETUP}" ]
then
- # Check for loop-aes-utils divertion
+ # Workaround for loop-aes-utils divertion
if [ -x /sbin/losetup.orig ]
then
LH_LOSETUP="losetup.orig"
@@ -180,23 +182,19 @@
fi
fi
+ # If we are root, disable root command
+ if [ "`id -u`" = "0" ]
+ then
+ # FIXME: this is disabled until considered save
+ LIVE_ROOT_COMMAND=""
+ fi
+
# Setting tasksel
if [ -z "${LH_TASKSEL}" ]
then
LH_TASKSEL="aptitude"
fi
- # Setting initramfs generator
- if [ -z "${LH_INITRAMFS}" ]
- then
- if [ "${LIVE_DISTRIBUTION}" = "etch" ]
- then
- LH_INITRAMFS="casper"
- else
- LH_INITRAMFS="live-initramfs"
- fi
- fi
-
# Setting root directory
if [ -z "${LIVE_ROOT}" ]
then
@@ -249,12 +247,6 @@
LH_VERBOSE="disabled"
fi
- # If we are root, disable root command
- if [ "`id -u`" = "0" ]
- then
- LIVE_ROOT_COMMAND=""
- fi
-
## config/bootstrap
# Setting architecture value
@@ -264,7 +256,8 @@
then
LIVE_ARCHITECTURE="`dpkg --print-architecture`"
else
- echo "E: Can't process file /usr/bin/dpkg (FIXME)"
+ echo "W: Can't process file /usr/bin/dpkg, setting architecture to i386"
+ LIVE_ARCHITECTURE="i386"
fi
fi
@@ -363,13 +356,27 @@
## config/chroot
+ # Setting chroot filesystem
+ if [ -z "${LIVE_CHROOT_FILESYSTEM}" ]
+ then
+ LIVE_CHROOT_FILESYSTEM="squashfs"
+ fi
+
+ # LIVE_HOOKS
+
# Setting interactive shell/X11/Xnest
if [ -z "${LIVE_INTERACTIVE}" ]
then
LIVE_INTERACTIVE="disabled"
fi
- # Setting kernel flavour string
+ # Setting keyring packages
+ # LIVE_KEYRING_PACKAGES
+
+ # Setting language string
+ # LIVE_LANGUAGE
+
+ # Setting linux flavour string
if [ -z "${LIVE_LINUX_FLAVOURS}" ]
then
case "${LIVE_ARCHITECTURE}" in
@@ -431,6 +438,7 @@
case "${LH_MODE}" in
debian)
LIVE_LINUX_FLAVOURS="sparc32"
+ # FIXME: needs update after etch
;;
ubuntu)
@@ -445,7 +453,7 @@
esac
fi
- # Set kernel packages
+ # Set linux packages
if [ -z "${LIVE_LINUX_PACKAGES}" ]
then
case "${LH_MODE}" in
@@ -464,15 +472,6 @@
fi
fi
- # Setting keyring packages
- # LIVE_KEYRING_PACKAGES
-
- # Setting language string
- # LIVE_LANGUAGE
-
- # Setting tasks
- # LIVE_TASKS
-
# Setting packages string
# LIVE_PACKAGES
@@ -510,7 +509,8 @@
LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/ //g'`"
LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/ //g'`"
- # LIVE_HOOKS
+ # Setting tasks
+ # LIVE_TASKS
# Setting security updates option
if [ -z "${LIVE_SECURITY}" ]
@@ -530,20 +530,49 @@
LIVE_SYSVINIT="disabled"
fi
- ## config/image
+ ## config/binary
+ # Setting image type
+ if [ -z "${LIVE_BINARY_IMAGES}" ]
+ then
+ LIVE_BINARY_IMAGES="iso"
+ fi
+
+ # Setting apt indices
+ if [ -z "${LIVE_BINARY_INDICES}" ]
+ then
+ LIVE_BINARY_INDICES="enabled"
+ fi
+
# Setting boot parameters
# LIVE_BOOTAPPEND
- # Setting encryption
- # LIVE_ENCRYPTION
+ # Setting bootloader
+ if [ -z "${LIVE_BOOTLOADER}" ]
+ then
+ case "${LIVE_ARCHITECTURE}" in
+ amd64|i386)
+ LIVE_BOOTLOADER="syslinux"
+ ;;
- # Setting username
- if [ -z "${LIVE_USERNAME}" ]
+ powerpc)
+ LIVE_BOOTLOADER="yaboot"
+ ;;
+ esac
+ fi
+
+ # Setting debian-installer option
+ if [ -z "${LIVE_DEBIAN_INSTALLER}" ]
then
- LIVE_USERNAME="user"
+ LIVE_DEBIAN_INSTALLER="disabled"
fi
+ # Setting encryption
+ # LIVE_ENCRYPTION
+
+ # Setting grub splash
+ # LIVE_GRUB_SPLASH
+
# Setting hostname
if [ -z "${LIVE_HOSTNAME}" ]
then
@@ -558,54 +587,50 @@
esac
fi
- # Setting image type
- if [ -z "${LIVE_BINARY_IMAGES}" ]
+ # Setting iso author
+ if [ -z "${LIVE_ISO_APPLICATION}" ]
then
- LIVE_BINARY_IMAGES="iso"
- fi
+ case "${LH_MODE}" in
+ debian)
+ LIVE_ISO_APPLICATION="Debian Live"
+ ;;
- # Setting image type
- if [ -z "${LIVE_SOURCE_IMAGES}" ]
- then
- LIVE_SOURCE_IMAGES="generic"
+ ubuntu)
+ LIVE_ISO_APPLICATION="Ubuntu Live"
+ ;;
+ esac
fi
- # Setting chroot filesystem
- if [ -z "${LIVE_CHROOT_FILESYSTEM}" ]
+ # Set iso preparer
+ if [ -z "${LIVE_ISO_PREPARER}" ]
then
- LIVE_CHROOT_FILESYSTEM="squashfs"
+ LIVE_ISO_PREPARER="live-helper ${VERSION}; http://packages.qa.debian.org/live-helper"
fi
- # Setting memtest option
- if [ -z "${LIVE_MEMTEST}" ]
+ # Set iso publisher
+ if [ -z "${LIVE_ISO_PUBLISHER}" ]
then
- LIVE_MEMTEST="memtest86+"
+ LIVE_ISO_PUBLISHER="Debian Live Project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org"
fi
- # Setting debian-installer option
- if [ -z "${LIVE_DEBIAN_INSTALLER}" ]
- then
- LIVE_DEBIAN_INSTALLER="disabled"
- fi
-
# Setting iso volume
if [ -z "${LIVE_ISO_VOLUME}" ]
then
case "${LH_MODE}" in
debian)
- LIVE_ISO_VOLUME="Debian Live \`date +%Y%m%d\`"
+ LIVE_ISO_VOLUME="Debian Live \`date +%Y%m%d-%H:%M\`"
;;
ubuntu)
- LIVE_ISO_VOLUME="Ubuntu Live \`date +%Y%m%d\`"
+ LIVE_ISO_VOLUME="Ubuntu Live \`date +%Y%m%d-%H:%M\`"
;;
esac
fi
- # Setting netboot server address
- if [ -z "${LIVE_NET_SERVER}" ]
+ # Setting memtest option
+ if [ -z "${LIVE_MEMTEST}" ]
then
- LIVE_NET_SERVER="192.168.1.1"
+ LIVE_MEMTEST="memtest86+"
fi
# Setting netboot server path
@@ -622,29 +647,32 @@
esac
fi
+ # Setting netboot server address
+ if [ -z "${LIVE_NET_SERVER}" ]
+ then
+ LIVE_NET_SERVER="192.168.1.1"
+ fi
+
+ # Setting syslinux splash
+ # LIVE_SYSLINUX_SPLASH
+
+ # Setting username
+ if [ -z "${LIVE_USERNAME}" ]
+ then
+ LIVE_USERNAME="user"
+ fi
+
+ ## config/source
+
# Setting source option
if [ -z "${LIVE_SOURCE}" ]
then
LIVE_SOURCE="disabled"
fi
- # Setting grub
- if [ -z "${LIVE_BOOTLOADER}" ]
+ # Setting image type
+ if [ -z "${LIVE_SOURCE_IMAGES}" ]
then
- case "${LIVE_ARCHITECTURE}" in
- i386)
- LIVE_BOOTLOADER="syslinux"
- ;;
-
- powerpc)
- LIVE_BOOTLOADER="yaboot"
- ;;
- esac
+ LIVE_SOURCE_IMAGES="generic"
fi
-
- # Setting grub splash
- # LIVE_GRUB_SPLASH
-
- # Setting syslinux splash
- # LIVE_SYSLINUX_SPLASH
}
Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso 2007-05-25 09:47:19 UTC (rev 1736)
+++ dists/trunk/live-helper/helpers/lh_binary_iso 2007-05-25 14:59:08 UTC (rev 1737)
@@ -67,6 +67,26 @@
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
fi
+ if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A ${LIVE_ISO_APPLICATION}"
+ fi
+
+ if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p ${LIVE_ISO_PREPARER}"
+ fi
+
+ if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher ${LIVE_ISO_PUBLISHER}"
+ fi
+
+ if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V ${LIVE_ISO_VOLUME}"
+ fi
+
# Moving image
mv binary chroot
@@ -102,7 +122,7 @@
fi
cat >> chroot/binary.sh << EOF
-${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org" -V "${LIVE_ISO_VOLUME}" -o binary.iso -r -J -l -cache-inodes binary
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes binary
EOF
Chroot "sh binary.sh"
Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config 2007-05-25 09:47:19 UTC (rev 1736)
+++ dists/trunk/live-helper/helpers/lh_config 2007-05-25 14:59:08 UTC (rev 1737)
@@ -55,19 +55,15 @@
Breakpoint "config: Init"
-# Creating configuration directory
+# Creating bootstrap configuration
mkdir -p "${LIVE_ROOT}"/config
mkdir -p "${LIVE_ROOT}"/config/includes
mkdir -p "${LIVE_ROOT}"/config/templates
# Creating live-helper configuration
cat > "${LIVE_ROOT}"/config/common << EOF
-# config/common: configuration for live-helper(7)
+# config/common - common options for live-helper(7)
-# \$LH_MODE: set distribution mode
-# (Default: ${LH_MODE})
-LH_MODE="${LH_MODE}"
-
# \$LH_APT: set package manager
# (Default: ${LH_APT})
LH_APT="${LH_APT}"
@@ -84,59 +80,67 @@
# (Default: ${LH_APT_PDIFFS})
LH_APT_PDIFFS="${LH_APT_PDIFFS}"
-# \$LH_APT_RECOMMENDS: enable recommends
+# \$LH_APT_RECOMMENDS: set apt/aptitude recommends
# (Default: ${LH_APT_RECOMMENDS})
LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"
-# \$LH_APT_SECURE: enable secure
+# \$LH_APT_SECURE: set apt/aptitude security
# (Default: ${LH_APT_SECURE})
LH_APT_SECURE="${LH_APT_SECURE}"
-# \$LH_BOOTSTRAP: select the bootstrap program
+# \$LH_BOOTSTRAP: set bootstrap program
# (Default: ${LH_BOOTSTRAP})
LH_BOOTSTRAP="${LH_BOOTSTRAP}"
-# \$LH_CACHE_INDICES: control if downloaded packages should be cached
+# \$LH_CACHE_INDICES: control if downloaded package indices should be cached
# (Default: ${LH_CACHE_INDICES})
LH_CACHE_INDICES="${LH_CACHE_INDICES}"
-# \$LH_CACHE_PACKAGES: control if downloaded packages should be cached
+# \$LH_CACHE_PACKAGES: control if downloaded packages files should be cached
# (Default: ${LH_CACHE_PACKAGES})
LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES}"
-# \$LH_CACHE_STAGES: control if downloaded packages should be cached
+# \$LH_CACHE_STAGES: control if completed stages should be cached
# (Default: ${LH_CACHE_STAGES})
LH_CACHE_STAGES="${LH_CACHE_STAGES}"
-# \$LH_DEBCONF_FRONTEND: set the debconf(1) frontend to use
+# \$LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
# (Default: ${LH_DEBCONF_FRONTEND})
LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}"
-# \$LH_DEBCONF_PRIORITY: set the debconf(1) priority to use
-# (Default: ${LH_DEBCONF_PRIORITY})
-LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
-
# \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
# (Default: ${LH_DEBCONF_NOWARNINGS})
LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
-# \$LH_GENISOIMAGE: set the genisoimage program
+# \$LH_DEBCONF_PRIORITY: set debconf(1) priority to use
+# (Default: ${LH_DEBCONF_PRIORITY})
+LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
+
+# \$LH_GENISOIMAGE: set genisoimage program
# (Default: ${LH_GENISOIMAGE})
LH_GENISOIMAGE="${LH_GENISOIMAGE}"
-# \$LH_LOSETUP: set the losetup program
+# \$LH_INITRAMFS: set initramfs hook
+# (Default: ${LH_INITRAMFS})
+LH_INITRAMFS="${LH_INITRAMFS}"
+
+# \$LH_LOSETUP: set losetup program
# (Default: autodetected)
LH_LOSETUP="${LH_LOSETUP}"
-# \$LH_TASKSEL: set the tasksel program
+# \$LH_MODE: set distribution mode
+# (Default: ${LH_MODE})
+LH_MODE="${LH_MODE}"
+
+# \$LH_ROOT_COMMAND: use sudo or equivalent
+# (Default: empty)
+#LH_ROOT_COMMAND="sudo"
+
+# \$LH_TASKSEL: set tasksel program
# (Default: ${LH_TASKSEL})
LH_TASKSEL="${LH_TASKSEL}"
-# \$LH_INITRAMFS: set the initramfs generator
-# (Default: ${LH_INITRAMFS})
-LH_INITRAMFS="${LH_INITRAMFS}"
-
-# \$LIVE_ROOT: set the root directory
+# \$LIVE_ROOT: set root directory
# (Default: ${LIVE_ROOT})
LIVE_ROOT="${LIVE_ROOT}"
@@ -150,10 +154,6 @@
# Live-helper options
-# \$LH_ROOT_COMMAND: use sudo or equivalent
-# (Default: empty)
-#LH_ROOT_COMMAND="sudo"
-
# \$LH_BREAKPOINTS: enable breakpoints
# (Default: ${LH_BREAKPOINTS})
#LH_BREAKPOINTS="${LH_BREAKPOINTS}"
@@ -175,47 +175,94 @@
#LH_VERBOSE="${LH_VERBOSE}"
EOF
+# Creating lh_bootstrap_* configuration
+cat > "${LIVE_ROOT}"/config/bootstrap << EOF
+# config/bootstrap - options for live-helper(7), bootstrap stage
+
+# \$LIVE_ARCHITECTURE: select chroot architecture
+# (Default: autodetected)
+LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}"
+
+# \$LIVE_DISTRIBUTION: select distribution to use
+# (Default: ${LIVE_DISTRIBUTION})
+LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
+
+# \$LIVE_DISTRIBUTION_CONFIG: set distribution config directory
+# (Default: empty)
+LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}"
+
+# \$LIVE_BOOTSTRAP_FLAVOUR: select flavour to use
+# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
+LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
+
+# \$LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# (Default: ${LIVE_MIRROR_BOOTSTRAP})
+LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
+
+# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY})
+LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}"
+
+# \$LIVE_MIRROR_BINARY: set mirror which ends up in the image
+# (Default: ${LIVE_MIRROR_BINARY})
+LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}"
+
+# \$LIVE_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
+# (Default: ${LIVE_MIRROR_BINARY_SECURITY})
+LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}"
+
+# \$LIVE_SECTIONS: select section(s) to use
+# (Default: ${LIVE_SECTIONS})
+LIVE_SECTIONS="${LIVE_SECTIONS}"
+EOF
+
# Creating lh_chroot_* configuration
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists
+mkdir -p "${LIVE_ROOT}"/config/chroot_sources
+
cat > "${LIVE_ROOT}"/config/chroot << EOF
-# config/chroot: configuration for lh_chroot_*
+# config/chroot - options for live-helper(7), chroot stage
# \$LIVE_CHROOT_FILESYSTEM: set chroot filesystem
# (Default: ${LIVE_CHROOT_FILESYSTEM})
LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}"
+# \$LIVE_HOOKS: set hook commands
+# (Default: empty)
+LIVE_HOOKS="${LIVE_HOOKS}"
+
# \$LIVE_INTERACTIVE: set interactive build
# (Default: ${LIVE_INTERACTIVE})
LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
-# \$LIVE_LINUX_FLAVOURS: set the kernel flavour to use
+# \$LIVE_KEYRING_PACKAGES: set keyring packages
+# (Default: empty)
+LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}"
+
+# \$LIVE_LANGUAGE: set language to use
+# (Default: empty)
+LIVE_LANGUAGE="${LIVE_LANGUAGE}"
+
+# \$LIVE_LINUX_FLAVOURS: set kernel flavour to use
# (Default: autodetected)
LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}"
-# \$LIVE_LINUX_PACKAGES: set the kernel packages to use
+# \$LIVE_LINUX_PACKAGES: set kernel packages to use
# (Default: autodetected)
LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}"
-# \$LIVE_KEYRING_PACKAGES: set the keyring packages
+# \$LIVE_PACKAGES: set packages to install
# (Default: empty)
-LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}"
-
-# \$LIVE_HOOKS: set hook commands
-# (Default: empty)
-LIVE_HOOKS="${LIVE_HOOKS}"
-
-# \$LIVE_LANGUAGE: set the language to use
-# (Default: empty)
-LIVE_LANGUAGE="${LIVE_LANGUAGE}"
-
-# \$LIVE_PACKAGES: set the packages to install
-# (Default: empty)
LIVE_PACKAGES="${LIVE_PACKAGES}"
-# \$LIVE_PACKAGES_LISTS: set the package list to install
+# \$LIVE_PACKAGES_LISTS: set package list to install
# (Default: ${LIVE_PACKAGES_LISTS})
LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}"
-# \$LIVE_TASKS: set the tasks to install
+# \$LIVE_TASKS: set tasks to install
# (Default: empty)
LIVE_TASKS="${LIVE_TASKS}"
@@ -232,58 +279,18 @@
LIVE_SYSVINIT="${LIVE_SYSVINIT}"
EOF
-# Creating lh_chroot_* directories
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages
-mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists
-mkdir -p "${LIVE_ROOT}"/config/chroot_sources
+# Creating lh_binary_* configuration
+mkdir -p "${LIVE_ROOT}"/config/binary_grub
+mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
+mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
-# Creating lh_bootstrap_* configuration
-cat > "${LIVE_ROOT}"/config/bootstrap << EOF
-# config/bootstrap: configuration for lh_bootstrap_*
+cat > "${LIVE_ROOT}"/config/binary << EOF
+# config/binary - options for live-helper(7), binary stage
-# \$LIVE_ARCHITECTURE: select the chroot architecture
-# (Default: autodetected)
-LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}"
+# \$LIVE_BINARY_IMAGES: set image type
+# (Default: ${LIVE_BINARY_IMAGES})
+LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}"
-# \$LIVE_DISTRIBUTION: select the distribution to use
-# (Default: ${LIVE_DISTRIBUTION})
-LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}"
-
-# \$LIVE_DISTRIBUTION_CONFIG: set distribution config directory
-# (Default: empty)
-LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}"
-
-# \$LIVE_BOOTSTRAP_FLAVOUR: select the flavour to use
-# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
-LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
-
-# \$LIVE_MIRROR_BOOTSTRAP: set the mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BOOTSTRAP})
-LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
-
-# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set the security mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY})
-LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}"
-
-# \$LIVE_MIRROR_BINARY: set the mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_BINARY})
-LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}"
-
-# \$LIVE_MIRROR_BINARY_SECURITY: set the security mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_BINARY_SECURITY})
-LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}"
-
-# \$LIVE_SECTIONS: select the section(s) to use
-# (Default: ${LIVE_SECTIONS})
-LIVE_SECTIONS="${LIVE_SECTIONS}"
-EOF
-
-# Creating lh_binary_* configuration
-cat > "${LIVE_ROOT}"/config/binary << EOF
-# config/chroot: configuration for lh_binary_*
-
# \$LIVE_BINARY_INDICES: set apt/aptitude generic indices
# (Default: ${LIVE_BINARY_INDICES})
LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}"
@@ -292,58 +299,66 @@
# (Default: empty)
LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}"
+# \$LIVE_BOOTLOADER: set bootloader
+# (Default: ${LIVE_BOOTLOADER})
+LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
+
+# \$LIVE_DEBIAN_INSTALLER: set debian-installer
+# (Default: ${LIVE_DEBIAN_INSTALLER})
+LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
+
# \$LIVE_ENCRYPTION: set encrytion
# (Default: empty)
LIVE_ENCRYPTION="${LIVE_ENCRYPTION}"
-# \$LIVE_USERNAME: set username
-# (Default: ${LIVE_USERNAME})
-LIVE_USERNAME="${LIVE_USERNAME}"
+# \$LIVE_GRUB_SPLASH: set custom grub splash
+# (Default: empty)
+LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}"
# \$LIVE_HOSTNAME: set hostname
# (Default: ${LIVE_HOSTNAME})
LIVE_HOSTNAME="${LIVE_HOSTNAME}"
-# \$LIVE_MEMTEST: set memtest
-# (Default: ${LIVE_MEMTEST})
-LIVE_MEMTEST="${LIVE_MEMTEST}"
+# \$LIVE_ISO_APPLICATION: set iso author
+# (Default: ${LIVE_ISO_APPLICATION})
+LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}"
-# \$LIVE_DEBIAN_INSTALLER: set debian-installer
-# (Default: ${LIVE_DEBIAN_INSTALLER})
-LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
+# \$LIVE_ISO_PREPARER: set iso preparer
+# (Default: ${LIVE_ISO_PREPARER})
+LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}"
+# \$LIVE_ISO_PUBLISHER: set iso preparer
+# (Default: ${LIVE_ISO_PUBLISHER})
+LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}"
+
# \$LIVE_ISO_VOLUME: set iso volume
# (Default: ${LIVE_ISO_VOLUME})
LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
-# \$LIVE_NET_SERVER: set the netboot server address
-# (Default: ${LIVE_NET_SERVER})
-LIVE_NET_SERVER="${LIVE_NET_SERVER}"
+# \$LIVE_MEMTEST: set memtest
+# (Default: ${LIVE_MEMTEST})
+LIVE_MEMTEST="${LIVE_MEMTEST}"
-# \$LIVE_NET_PATH: set the netboot server directory
+# \$LIVE_NET_PATH: set netboot server directory
# (Default: ${LIVE_NET_PATH})
LIVE_NET_PATH="${LIVE_NET_PATH}"
-# \$LIVE_BOOTLOADER: set bootloader
-# (Default: ${LIVE_BOOTLOADER})
-LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
+# \$LIVE_NET_SERVER: set netboot server address
+# (Default: ${LIVE_NET_SERVER})
+LIVE_NET_SERVER="${LIVE_NET_SERVER}"
-# \$LIVE_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}"
-
# \$LIVE_SYSLINUX_SPLASH: set custom syslinux splash
# (Default: empty)
LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}"
-# \$LIVE_BINARY_IMAGES: set image type
-# (Default: ${LIVE_BINARY_IMAGES})
-LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}"
+# \$LIVE_USERNAME: set username
+# (Default: ${LIVE_USERNAME})
+LIVE_USERNAME="${LIVE_USERNAME}"
EOF
# Creating lh_source_* configuration
cat > "${LIVE_ROOT}"/config/source << EOF
-# config/chroot: configuration for lh_source_*
+# config/source - options for live-helper(7), source stage
# \$LIVE_SOURCE: set source option
# (Default: ${LH_SOURCE})
@@ -353,8 +368,3 @@
# (Default: ${LIVE_SOURCE_IMAGES})
LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}"
EOF
-
-# Creating lh_binary_* directories
-mkdir -p "${LIVE_ROOT}"/config/binary_grub
-mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
-mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
Modified: dists/trunk/live-helper/helpers/lh_source_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_iso 2007-05-25 09:47:19 UTC (rev 1736)
+++ dists/trunk/live-helper/helpers/lh_source_iso 2007-05-25 14:59:08 UTC (rev 1737)
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_source_iso(1) - build source iso image
+# lh_source_iso(1) - build iso source image
# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -16,7 +16,7 @@
done
# Set static variables
-DESCRIPTION="build source iso image"
+DESCRIPTION="build iso source image"
HELP=""
USAGE="${PROGRAM} [--force]"
@@ -61,7 +61,7 @@
# Installing depends
Install_package
- # Remove old source
+ # Remove old iso image
if [ -f source.iso ]
then
rm -f source.iso
@@ -72,11 +72,31 @@
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
fi
+ if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A ${LIVE_ISO_APPLICATION}"
+ fi
+
+ if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p ${LIVE_ISO_PREPARER}"
+ fi
+
+ if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher ${LIVE_ISO_PUBLISHER}"
+ fi
+
+ if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V ${LIVE_ISO_VOLUME}"
+ fi
+
# Moving image
mv source chroot
cat >> chroot/source.sh << EOF
-${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org" -V "${LIVE_ISO_VOLUME}" -o source.iso -r -J -l -cache-inodes source
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source
EOF
Chroot "sh source.sh"
More information about the Debian-live-changes
mailing list