summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:09 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:29 +0100
commit97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179 (patch)
treed7facbbbf53b1a5bc0fa92f671f5b1e29a7e3200 /helpers
parent7c68e6ebca01f64501453fa53941ac77b9c2c335 (diff)
downloadvyos-live-build-97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179.tar.gz
vyos-live-build-97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179.zip
Adding live-helper 1.0~a10-1.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_binary4
-rwxr-xr-xhelpers/lh_binary_debian-installer18
-rwxr-xr-xhelpers/lh_binary_encryption14
-rwxr-xr-xhelpers/lh_binary_grub38
-rwxr-xr-xhelpers/lh_binary_hdd2
-rwxr-xr-xhelpers/lh_binary_includes8
-rwxr-xr-xhelpers/lh_binary_iso36
-rwxr-xr-xhelpers/lh_binary_linux-image (renamed from helpers/lh_binary_linuximage)14
-rwxr-xr-xhelpers/lh_binary_local-includes (renamed from helpers/lh_binary_localincludes)14
-rwxr-xr-xhelpers/lh_binary_md5sum4
-rwxr-xr-xhelpers/lh_binary_memtest6
-rwxr-xr-xhelpers/lh_binary_net12
-rwxr-xr-xhelpers/lh_binary_rootfs12
-rwxr-xr-xhelpers/lh_binary_syslinux88
-rwxr-xr-xhelpers/lh_binary_usb-hdd2
-rwxr-xr-xhelpers/lh_binary_yaboot38
-rwxr-xr-xhelpers/lh_bootstrap_cdebootstrap9
-rwxr-xr-xhelpers/lh_bootstrap_debootstrap9
-rwxr-xr-xhelpers/lh_chroot12
-rwxr-xr-xhelpers/lh_chroot_apt2
-rwxr-xr-xhelpers/lh_chroot_hacks2
-rwxr-xr-xhelpers/lh_chroot_linux-image (renamed from helpers/lh_chroot_linuximage)16
-rwxr-xr-xhelpers/lh_chroot_local-hooks (renamed from helpers/lh_chroot_localhooks)14
-rwxr-xr-xhelpers/lh_chroot_local-includes (renamed from helpers/lh_chroot_localincludes)12
-rwxr-xr-xhelpers/lh_chroot_local-packages (renamed from helpers/lh_chroot_localpackages)22
-rwxr-xr-xhelpers/lh_chroot_local-packageslists (renamed from helpers/lh_chroot_localpackageslists)16
-rwxr-xr-xhelpers/lh_chroot_sources94
-rwxr-xr-xhelpers/lh_config92
-rwxr-xr-xhelpers/lh_source4
-rwxr-xr-xhelpers/lh_source_debian (renamed from helpers/lh_source_download)10
-rwxr-xr-xhelpers/lh_source_debian-live (renamed from helpers/lh_source_config)8
-rwxr-xr-xhelpers/lh_source_generic4
-rwxr-xr-xhelpers/lh_source_hdd4
-rwxr-xr-xhelpers/lh_source_iso36
-rwxr-xr-xhelpers/lh_source_md5sum5
-rwxr-xr-xhelpers/lh_source_net4
-rwxr-xr-xhelpers/lh_source_usb-hdd4
-rwxr-xr-xhelpers/make-live50
38 files changed, 411 insertions, 328 deletions
diff --git a/helpers/lh_binary b/helpers/lh_binary
index 038a19a4a..45c405a10 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -41,14 +41,14 @@ lh_binary_manifest ${*}
lh_binary_encryption ${*}
# Prepare images
-lh_binary_linuximage ${*}
+lh_binary_linux-image ${*}
lh_binary_debian-installer ${*}
lh_binary_memtest ${*}
lh_binary_grub ${*}
lh_binary_syslinux ${*}
lh_binary_yaboot ${*}
lh_binary_includes ${*}
-lh_binary_localincludes ${*}
+lh_binary_local-includes ${*}
lh_binary_md5sum ${*}
# Building images
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index b5927a090..034430393 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -52,7 +52,7 @@ Check_lockfile .lock
Create_lockfile .lock
# Setting destination directory
-case "${LIVE_BINARY_IMAGE}" in
+case "${LIVE_BINARY_IMAGES}" in
iso)
DESTDIR="binary/install"
DESTDIR_INSTALLER="cdrom"
@@ -67,13 +67,13 @@ case "${LIVE_BINARY_IMAGE}" in
;;
usb-hdd|hdd)
- DESTDIR="binary"
+ DESTDIR="binary/install"
DESTDIR_INSTALLER="hd-media"
;;
esac
# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
# Assemble multi-arch
if [ -n "${MULTIARCH}" ]
@@ -97,16 +97,16 @@ fi
# Downloading debian-installer
mkdir -p "${DESTDIR}"
-wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
-wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
# Downloading graphical-installer
if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
then
mkdir -p "${DESTDIR}"/gtk
- wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+ wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
fi
FIXME ()
@@ -114,7 +114,7 @@ FIXME ()
# Downloading udebs
mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-wget "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
+wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
gunzip -c Packages.gz > Packages
cd "${OLDPWD}"
@@ -132,7 +132,7 @@ for UDEB in ${UDEBS}
do
mkdir -p binary/`dirname ${UDEB}`
cd binary/`dirname ${UDEB}`
- wget "${LIVE_MIRROR_BUILD}"/${UDEB}
+ wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
cd "${OLDPWD}"
done
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index e40420788..f055a076c 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -62,7 +62,7 @@ case "${LH_INITRAMFS}" in
;;
esac
-case "${LIVE_FILESYSTEM}" in
+case "${LIVE_CHROOT_FILESYSTEM}" in
ext2)
ROOTFS="ext2"
;;
@@ -84,14 +84,14 @@ Check_package chroot/usr/bin/aespipe aespipe
Install_package
# Moving image
-mv binary/${INITFS}/filesystem.${LIVE_FILESYSTEM} chroot
+mv binary/${INITFS}/filesystem.${LIVE_CHROOT_FILESYSTEM} chroot
echo "Encrypting binary/${INITFS}/filesystem.${ROOTFS} with ${LIVE_ENCRYPTION}..."
-cat >> chroot/encrypt << EOF
+cat >> chroot/encrypt.sh << EOF
while true
do
- cat filesystem.${ROOTFS} | aespipe -e ${LIVE_ENCRYPTION} -T > filesystem.${ROOTFS} && break
+ cat filesystem.${ROOTFS} | aespipe -e ${LIVE_ENCRYPTION} -T > filesystem.${ROOTFS}.tmp && mv filesystem.${ROOTFS}.tmp filesystem.${ROOTFS} && break
echo -n "Something went wrong... Retry? [YES/no] "
@@ -105,11 +105,11 @@ do
done
EOF
-Chroot "sh encrypt"
+Chroot "sh encrypt.sh"
# Move image
-mv chroot/filesystem.${LIVE_FILESYSTEM} binary/${INITFS}
-rm -f chroot/encrypt
+mv chroot/filesystem.${LIVE_CHROOT_FILESYSTEM} binary/${INITFS}
+rm -f chroot/encrypt.sh
# Removing depends
Remove_package
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index 35e3e4867..6476f0c72 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -57,7 +57,7 @@ then
exit 0
fi
-# Check templates
+# Check user templates
if [ ! -d "${LIVE_TEMPLATES}" ]
then
if [ -d ../"${LIVE_TEMPLATES}" ]
@@ -69,6 +69,12 @@ then
fi
fi
+# Check local templates
+if [ -d config/templates/grub ]
+then
+ LIVE_TEMPLATES="config/templates"
+fi
+
# Checking depends
Check_package chroot/usr/sbin/grub grub
@@ -86,7 +92,7 @@ case "${LH_INITRAMFS}" in
esac
# Setting destination directory
-case "${LIVE_BINARY_IMAGE}" in
+case "${LIVE_BINARY_IMAGES}" in
iso|usb-hdd|hdd)
DESTDIR_LIVE="binary/live"
DESTDIR_INSTALL="binary/install"
@@ -99,7 +105,7 @@ case "${LIVE_BINARY_IMAGE}" in
esac
# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
# Assemble multi-arch
if [ -n "${MULTIARCH}" ]
@@ -146,12 +152,12 @@ LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
# Assembling kernel configuration
-DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
+DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
LINUX="title\t\tDebian GNU/Linux - live\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
-if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then
for KERNEL in chroot/boot/vmlinuz*
do
@@ -173,15 +179,15 @@ if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
then
LINUX="title\t\tLive:\nroot\n\n${LINUX}"
- LIVE_KERNEL_INSTALL="title\t\tInstaller:\nroot"
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ LIVE_LINUX_INSTALL="title\t\tInstaller:\nroot"
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
fi
# Assembling memtest configuration
@@ -196,7 +202,7 @@ mkdir -p binary/boot/grub
cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub
# Copyring grub
-case ${LIVE_BINARY_IMAGE} in
+case ${LIVE_BINARY_IMAGES} in
iso)
cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub
;;
@@ -236,7 +242,7 @@ root
LIVE_MEMTEST
EOF
-sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
+sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
# Removing depends
diff --git a/helpers/lh_binary_hdd b/helpers/lh_binary_hdd
index a3af088fd..8841d155b 100755
--- a/helpers/lh_binary_hdd
+++ b/helpers/lh_binary_hdd
@@ -33,7 +33,7 @@ Read_conffile config/source
Set_defaults
-for IMAGE in ${LIVE_BINARY_IMAGE}
+for IMAGE in ${LIVE_BINARY_IMAGES}
do
if [ "${IMAGE}" = "hdd" ]
then
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index 4a1bc9331..92b6a685a 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -51,7 +51,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Check includes
+# Check user includes
if [ ! -d "${LIVE_INCLUDES}" ]
then
if [ -d ../"${LIVE_INCLUDES}" ]
@@ -63,6 +63,12 @@ then
fi
fi
+# Checking local includes
+if [ -d config/includes/"${LIVE_DISTRIBUTION}" ]
+then
+ LIVE_INCLUDES="config/includes"
+fi
+
# Assemble architecture
case "${LIVE_ARCHITECTURE}" in
amd64)
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index a949ff6f3..2f9fc2e5c 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-for IMAGE in ${LIVE_BINARY_IMAGE}
+for IMAGE in ${LIVE_BINARY_IMAGES}
do
if [ "${IMAGE}" = "iso" ]
then
@@ -75,23 +75,41 @@ do
then
case "${LIVE_BOOTLOADER}" in
grub)
- Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes -b boot/grub/stage2_eltorito -m boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table binary"
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b boot/grub/stage2_eltorito"
+
+ if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
+ fi
;;
syslinux)
- #Chroot "${LH_GENISOIMAGE} -A \"Debian Live\" -p \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org\" -publisher \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org\" -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" -cache-inodes -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
- Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes -b isolinux/isolinux.bin -m isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
+
+ if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
+ fi
+ ;;
+
+ *)
+ Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
+ sleep 5
;;
esac
- else
- Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
- sleep 5
- #Chroot "${LH_GENISOIMAGE} -A 'Debian Live' -p 'Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org' -publisher 'Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org' -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" binary"
- Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE} -o binary.iso -r -J -l binary -cache-inodes"
+
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
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@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -V "${LIVE_ISO_VOLUME}" -o binary.iso -r -J -l -cache-inodes binary
+EOF
+
+ Chroot "sh binary.sh"
+
# Move image
mv chroot/binary chroot/binary.iso ./
+ rm -f chroot/binary.sh
# Removing depends
Remove_package
diff --git a/helpers/lh_binary_linuximage b/helpers/lh_binary_linux-image
index 629ef7782..c7e5dd6f1 100755
--- a/helpers/lh_binary_linuximage
+++ b/helpers/lh_binary_linux-image
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_binary_linuximage(1) - install linux-image into binary
+# lh_binary_linux-image(1) - install linux-image into binary
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -32,13 +32,13 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "binary_linuximage: Init"
+Breakpoint "binary_linux-image: Init"
# Requiring stage file
Require_stagefile .stage/bootstrap
# Checking stage file
-Check_stagefile .stage/binary_linuximage
+Check_stagefile .stage/binary_linux-image
# Checking lock file
Check_lockfile .lock
@@ -50,7 +50,7 @@ Create_lockfile .lock
rm -f chroot/boot/initrd*bak*
# Setting destination directory
-case "${LIVE_BINARY_IMAGE}" in
+case "${LIVE_BINARY_IMAGES}" in
iso)
DESTDIR="binary/live"
;;
@@ -60,12 +60,12 @@ case "${LIVE_BINARY_IMAGE}" in
;;
usb-hdd|hdd)
- DESTDIR="binary"
+ DESTDIR="binary/live"
;;
esac
# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
# Assemble multi-arch
if [ -n "${MULTIARCH}" ]
@@ -97,4 +97,4 @@ cp chroot/boot/vmlinuz* "${DESTDIR}"
cp chroot/boot/initrd.img* "${DESTDIR}"
# Creating stage file
-Create_stagefile .stage/binary_linuximage
+Create_stagefile .stage/binary_linux-image
diff --git a/helpers/lh_binary_localincludes b/helpers/lh_binary_local-includes
index 66504c1d2..8b6e5aa6f 100755
--- a/helpers/lh_binary_localincludes
+++ b/helpers/lh_binary_local-includes
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_binary_localincludes(1) - copy files into binary
+# lh_binary_local-includes(1) - copy files into binary
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -32,13 +32,13 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "binary_localincludes: Init"
+Breakpoint "binary_local-includes: Init"
# Requiring stage file
Require_stagefile .stage/bootstrap
# Checking stage file
-Check_stagefile .stage/binary_localincludes
+Check_stagefile .stage/binary_local-includes
# Checking lock file
Check_lockfile .lock
@@ -46,19 +46,19 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if ls config/binary_localincludes/* &> /dev/null
+if ls config/binary_local-includes/* &> /dev/null
then
# Copying includes
- cd config/binary_localincludes
+ cd config/binary_local-includes
find . | cpio -dmpu "${OLDPWD}"/binary
cd "${OLDPWD}"
# Removing symlinks
- if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
+ if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
then
find binary -type l | xargs rm -f
fi
# Creating stage file
- Create_stagefile .stage/binary_localincludes
+ Create_stagefile .stage/binary_local-includes
fi
diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum
index 8964593ba..e04440645 100755
--- a/helpers/lh_binary_md5sum
+++ b/helpers/lh_binary_md5sum
@@ -54,7 +54,9 @@ fi
# Calculating md5sums
cd binary
-find . -type f -print0 | xargs -0 md5sum > md5sum.txt
+find . -type f | sort | grep -v 'isolinux/isolinux.bin' | grep -v 'boot/grub/stage2_eltorito' | xargs md5sum > ../md5sum.txt
+mv ../md5sum.txt ./
+
cd "${OLDPWD}"
# Creating stage file
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index edf3830ed..eedc0547b 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -72,7 +72,7 @@ esac
Install_package
# Setting destination directory
-case "${LIVE_BINARY_IMAGE}" in
+case "${LIVE_BINARY_IMAGES}" in
iso)
DESTDIR="binary/live"
;;
@@ -82,12 +82,12 @@ case "${LIVE_BINARY_IMAGE}" in
;;
usb-hdd|hdd)
- DESTDIR="binary"
+ DESTDIR="binary/live"
;;
esac
# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
# Assemble multi-arch
if [ -n "${MULTIARCH}" ]
diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net
index 47ed7d238..6ebe7ea74 100755
--- a/helpers/lh_binary_net
+++ b/helpers/lh_binary_net
@@ -34,7 +34,7 @@ Set_defaults
Breakpoint "binary_net: Init"
-for IMAGE in ${LIVE_BINARY_IMAGE}
+for IMAGE in ${LIVE_BINARY_IMAGES}
do
if [ "${IMAGE}" = "net" ]
then
@@ -57,21 +57,21 @@ do
fi
# Creating image file
- if [ "`basename ${LIVE_SERVER_PATH}`" = "chroot" ]
+ if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
then
mv chroot chroot.tmp
fi
- mv binary "`basename ${LIVE_SERVER_PATH}`"
+ mv binary "`basename ${LIVE_NET_PATH}`"
cd ..
- tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_SERVER_PATH}`" "`basename ${OLDPWD}`/tftpboot"
+ tar cfz binary-net.tar.gz "`basename ${OLDPWD}`/`basename ${LIVE_NET_PATH}`" "`basename ${OLDPWD}`/tftpboot"
mv binary-net.tar.gz "${OLDPWD}"
cd "${OLDPWD}"
- mv "`basename ${LIVE_SERVER_PATH}`" binary
+ mv "`basename ${LIVE_NET_PATH}`" binary
- if [ "`basename ${LIVE_SERVER_PATH}`" = "chroot" ]
+ if [ "`basename ${LIVE_NET_PATH}`" = "chroot" ]
then
mv chroot.tmp chroot
fi
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index ce93038dc..47529a297 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -63,7 +63,7 @@ then
mkdir -p binary/${INITFS}
fi
-case "${LIVE_FILESYSTEM}" in
+case "${LIVE_CHROOT_FILESYSTEM}" in
ext2)
# Checking depends
Check_package chroot/usr/bin/genext2fs genext2fs
@@ -119,17 +119,17 @@ case "${LIVE_FILESYSTEM}" in
if [ "${LH_VERBOSE}" = "enabled" ]
then
- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -i"
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
fi
- # Create image
if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
then
- Chroot "mksquashfs ${MKSQUASHFS_OPTIONS} chroot filesystem.squashfs"
- else
- Chroot "mksquashfs ${MKSQUASHFS_OPTIONS} chroot filesystem.squashfs -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
fi
+ # Create image
+ Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
+
# Move image
${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
${LH_ROOT_COMMAND} rm -rf chroot/chroot
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 4ca64086f..ea78c8626 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -57,7 +57,7 @@ then
exit 0
fi
-# Checking templates
+# Checking user templates
if [ ! -d "${LIVE_TEMPLATES}" ]
then
if [ -d ../"${LIVE_TEMPLATES}" ]
@@ -69,6 +69,12 @@ then
fi
fi
+# Check local templates
+if [ -d config/templates/syslinux ]
+then
+ LIVE_TEMPLATES="config/templates"
+fi
+
# Checking depends
Check_package chroot/usr/bin/syslinux syslinux
@@ -86,7 +92,7 @@ case "${LH_INITRAMFS}" in
esac
# Setting destination directory
-case "${LIVE_BINARY_IMAGE}" in
+case "${LIVE_BINARY_IMAGES}" in
iso)
DESTDIR_LIVE="binary/live"
DESTDIR_INSTALL="binary/install"
@@ -98,13 +104,13 @@ case "${LIVE_BINARY_IMAGE}" in
;;
usb-hdd|hdd)
- DESTDIR_LIVE="binary"
- DESTDIR_INSTALL="binary"
+ DESTDIR_LIVE="binary/live"
+ DESTDIR_INSTALL="binary/install"
;;
esac
# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
# Assembling multi-arch
if [ -n "${MULTIARCH}" ]
@@ -151,24 +157,24 @@ LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
# Assembling kernel configuration
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+if [ "${LIVE_BINARY_IMAGES}" != "net" ]
then
- DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
+ DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
else
- DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
+ DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
fi
-if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then
for KERNEL in chroot/boot/vmlinuz*
do
if [ -z "${LINUX}" ]
then
- if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
@@ -177,7 +183,7 @@ then
LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
fi
else
- if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
@@ -195,21 +201,21 @@ LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
# Assembling debian-installer configuration
if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
then
- LIVE_KERNEL_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- \n\n"
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
- LIVE_KENREL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz rescue/enable=true -- "
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz rescue/enable=true -- "
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
- LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
+ LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
+ LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz rescue/enable=true -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz rescue/enable=true -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
+ LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
fi
# Assembling memtest configuration
if [ -f "${DESTDIR_LIVE}"/memtest ]
then
- if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
@@ -218,7 +224,7 @@ then
fi
fi
-case "${LIVE_BINARY_IMAGE}" in
+case "${LIVE_BINARY_IMAGES}" in
iso)
# Copying syslinux
mkdir -p binary/isolinux
@@ -243,7 +249,7 @@ case "${LIVE_BINARY_IMAGE}" in
fi
# Configure syslinux templates
- sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/isolinux/isolinux.cfg
+ sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/isolinux/isolinux.cfg
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt
sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
@@ -252,9 +258,9 @@ case "${LIVE_BINARY_IMAGE}" in
rm -f binary/isolinux/pxelinux.cfg
# Working arround syslinux 8.3 limitation
- if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+ if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then
- for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
+ for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
do
NUMBER=$(($NUMBER + 1))
@@ -263,9 +269,9 @@ case "${LIVE_BINARY_IMAGE}" in
sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg
done
else
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz
- mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/initrd.img
- sed -i -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/isolinux/isolinux.cfg
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+ sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
fi
;;
@@ -297,8 +303,8 @@ case "${LIVE_BINARY_IMAGE}" in
fi
# Configure syslinux templates
- sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default
- sed -i -e "s/LIVE_SERVER_ADDRESS/${LIVE_SERVER_ADDRESS}/" -e "s#LIVE_SERVER_PATH#${LIVE_SERVER_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default
+ sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default
+ sed -i -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
@@ -306,9 +312,9 @@ case "${LIVE_BINARY_IMAGE}" in
rm -f tftpboot/pxelinux.cfg/isolinux.cfg
# Working arround syslinux 8.3 limitation
- if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+ if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then
- for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
+ for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
do
NUMBER=$(($NUMBER + 1))
@@ -317,9 +323,9 @@ case "${LIVE_BINARY_IMAGE}" in
sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg
done
else
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz
- mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/initrd.img
- sed -i -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/isolinux/isolinux.cfg
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+ sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
fi
;;
@@ -348,7 +354,7 @@ case "${LIVE_BINARY_IMAGE}" in
fi
# Configure syslinux templates
- sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/syslinux.cfg
+ sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/syslinux.cfg
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/syslinux.cfg
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/f1.txt
sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/f10.txt
@@ -357,9 +363,9 @@ case "${LIVE_BINARY_IMAGE}" in
rm -f binary/pxelinux.cfg
# Working arround syslinux 8.3 limitation
- if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+ if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then
- for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
+ for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
do
NUMBER=$(($NUMBER + 1))
@@ -368,9 +374,9 @@ case "${LIVE_BINARY_IMAGE}" in
sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/syslinux.cfg
done
else
- mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz
- mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR_LIVE}"/initrd.img
- sed -i -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/syslinux.cfg
+ mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+ mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+ sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/syslinux.cfg
fi
;;
esac
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index e643966cf..5185a95a0 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -34,7 +34,7 @@ Set_defaults
Breakpoint "binary_usb-hdd: Init"
-for IMAGE in ${LIVE_BINARY_IMAGE}
+for IMAGE in ${LIVE_BINARY_IMAGES}
do
if [ "${IMAGE}" = "usb-hdd" ]
then
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index 7f82d404f..b8da49923 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -57,7 +57,7 @@ then
exit 0
fi
-# Check templates
+# Check user templates
if [ ! -d "${LIVE_TEMPLATES}" ]
then
if [ -d ../"${LIVE_TEMPLATES}" ]
@@ -69,6 +69,12 @@ then
fi
fi
+# Checking local templates
+if [ -d config/templates/yaboot ]
+then
+ LIVE_TEMPLATES="config/templates"
+fi
+
# Checking depends
Check_package chroot/usr/lib/yaboot/yaboot yaboot
@@ -86,7 +92,7 @@ case "${LH_INITRAMFS}" in
esac
# Setting destination directory
-case "${LIVE_BINARY_IMAGE}" in
+case "${LIVE_BINARY_IMAGES}" in
iso)
DESTDIR="binary/live"
;;
@@ -97,7 +103,7 @@ case "${LIVE_BINARY_IMAGE}" in
esac
# Temporary check for broken yaboot
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
case "${LIVE_ARCHITECTURE}" in
powerpc)
@@ -131,30 +137,30 @@ fi
LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/ //'`"
# Assembling kernel configuration
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
- DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
+ DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
LINUX="image=/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
else
- DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
+ DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
LINUX="image=`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
fi
# FIXME
-if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then
for KERNEL in chroot/boot/vmlinuz*
do
if [ -z "${LINUX}" ]
then
- if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
else
LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel `basename ${KERNEL}`\n append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
fi
else
- if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+ if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
then
LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
else
@@ -166,7 +172,7 @@ fi
LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-case "${LIVE_BINARY_IMAGE}" in
+case "${LIVE_BINARY_IMAGES}" in
iso)
# Copying yaboot
mkdir -p binary/install
@@ -174,14 +180,14 @@ case "${LIVE_BINARY_IMAGE}" in
cp -r "${LIVE_TEMPLATES}"/yaboot/* binary/yaboot
# Configure yaboot templates
- sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/yaboot.conf
+ sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/yaboot.conf
sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/yaboot/yaboot.conf
sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_VERSION/${VERSION}/" binary/yaboot/boot.msg
# Working arround yaboot 8.3 limitation
- if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+ if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
then
- for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
+ for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
do
NUMBER=$(($NUMBER + 1))
@@ -190,9 +196,9 @@ case "${LIVE_BINARY_IMAGE}" in
sed -i -e "s/LIVE.*-${FLAVOUR}/live${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
done
else
- mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
- mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
- sed -i -e "s/LIVE.*-${LIVE_KERNEL_FLAVOUR}/live/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
+ mv "${DESTDIR}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/vmlinuz
+ mv "${DESTDIR}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/initrd.img
+ sed -i -e "s/LIVE.*-${LIVE_LINUX_FLAVOURS}/live/g" -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
fi
;;
esac
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index cc7ffca7e..dad894865 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -120,7 +120,7 @@ then
fi
# Executing cdebootstrap (download-only)
- ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}"
+ ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
if [ -n "${LH_ROOT_COMMAND}" ]
then
@@ -143,7 +143,7 @@ then
fi
# Executing cdebootstrap (regular run)
- ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}"
+ ${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}"
if [ -n "${LH_ROOT_COMMAND}" ]
then
@@ -174,6 +174,11 @@ then
rm -rf cache/stages_bootstrap
fi
+ if [ ! -d cache ]
+ then
+ mkdir cache
+ fi
+
${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
if [ -n "${LH_ROOT_COMMAND}" ]
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index 0538422b1..c3e4cada4 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -103,7 +103,7 @@ then
fi
# Executing debootstrap (download-only)
- ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+ ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
if [ -n "${LH_ROOT_COMMAND}" ]
then
@@ -126,7 +126,7 @@ then
fi
# Executing debootstrap (regular run)
- ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+ ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BOOTSTRAP}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
if [ -n "${LH_ROOT_COMMAND}" ]
then
@@ -146,6 +146,11 @@ then
rm -rf cache/stages_bootstrap
fi
+ if [ ! -d cache ]
+ then
+ mkdir cache
+ fi
+
${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
if [ -n "${LH_ROOT_COMMAND}" ]
diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index 451a6b463..7c0015e2c 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -43,25 +43,25 @@ lh_chroot_hosts install ${*}
lh_chroot_resolv install ${*}
lh_chroot_apt install ${*}
lh_chroot_sources install ${*}
-lh_chroot_linuximage install ${*}
+lh_chroot_linux-image install ${*}
# Customizing chroot
lh_chroot_tasks ${*}
lh_chroot_packageslists ${*}
lh_chroot_packages ${*}
-lh_chroot_localpackages ${*}
-lh_chroot_localpackageslists ${*}
+lh_chroot_local-packageslists ${*}
+lh_chroot_local-packages ${*}
lh_chroot_localization ${*}
-lh_chroot_localincludes ${*}
+lh_chroot_local-includes ${*}
lh_chroot_sysvinit ${*}
lh_chroot_hooks ${*}
-lh_chroot_localhooks ${*}
+lh_chroot_local-hooks ${*}
lh_chroot_symlinks ${*}
lh_chroot_hacks ${*}
lh_chroot_interactive ${*}
# Deconfiguring chroot
-lh_chroot_linuximage remove ${*}
+lh_chroot_linux-image remove ${*}
lh_chroot_sources remove ${*}
lh_chroot_apt remove ${*}
lh_chroot_resolv remove ${*}
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index c7cce8906..97d70879b 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -94,10 +94,12 @@ case "${1}" in
case "${LH_APT_SECURE}" in
enabled)
echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure
+ echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure
;;
disabled)
echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure
+ echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> chroot/etc/apt/apt.conf.d/00secure
;;
esac
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index ea746665b..1c828dc25 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -49,7 +49,7 @@ Create_lockfile .lock
# Removing udev mac caching rule
Chroot "rm -f /etc/udev/rules.d/z25_persistent-net.rules"
-case "${LIVE_BINARY_IMAGE}" in
+case "${LIVE_BINARY_IMAGES}" in
net)
if [ ! -f chroot/usr/bin/smbmount ]
then
diff --git a/helpers/lh_chroot_linuximage b/helpers/lh_chroot_linux-image
index bd0c22895..660ae401d 100755
--- a/helpers/lh_chroot_linuximage
+++ b/helpers/lh_chroot_linux-image
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_chroot_linuximage(1) - manage /etc/kernel-img.conf
+# lh_chroot_linux-image(1) - manage /etc/kernel-img.conf
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_linuximage: Init"
+Breakpoint "chroot_linux-image: Init"
# Requiring stage file
Require_stagefile .stage/bootstrap
@@ -40,7 +40,7 @@ Require_stagefile .stage/bootstrap
case "${1}" in
install)
# Checking stage file
- Check_stagefile .stage/chroot_linuximage
+ Check_stagefile .stage/chroot_linux-image
# Checking lock file
Check_lockfile .lock
@@ -61,11 +61,11 @@ do_initrd = Yes
warn_initrd = No
EOF
- if [ "${LIVE_KERNEL_PACKAGES}" != "none" ]
+ if [ "${LIVE_LINUX_PACKAGES}" != "none" ]
then
- for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
+ for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
do
- for PACKAGE in ${LIVE_KERNEL_PACKAGES}
+ for PACKAGE in ${LIVE_LINUX_PACKAGES}
do
PACKAGES="${PACKAGES} ${PACKAGE}-${FLAVOUR}"
done
@@ -86,7 +86,7 @@ EOF
esac
# Creating stage file
- Create_stagefile .stage/chroot_linuximage
+ Create_stagefile .stage/chroot_linux-image
;;
remove)
@@ -106,7 +106,7 @@ EOF
fi
# Removing stage file
- rm -f .stage/chroot_linuximage
+ rm -f .stage/chroot_linux-image
;;
*)
diff --git a/helpers/lh_chroot_localhooks b/helpers/lh_chroot_local-hooks
index 2dca7f7ba..953a1f13d 100755
--- a/helpers/lh_chroot_localhooks
+++ b/helpers/lh_chroot_local-hooks
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_chroot_localhooks(1) - execute local hooks in chroot
+# lh_chroot_local-hooks(1) - execute local hooks in chroot
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -32,13 +32,13 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_localhooks: Init"
+Breakpoint "chroot_local-hooks: Init"
# Requiring stage file
Require_stagefile .stage/bootstrap
# Checking stage file
-Check_stagefile .stage/chroot_localhooks
+Check_stagefile .stage/chroot_local-hooks
# Checking lock file
Check_lockfile .lock
@@ -46,10 +46,10 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Processing localhooks
-if ls config/chroot_localhooks/* &> /dev/null
+# Processing local-hooks
+if ls config/chroot_local-hooks/* &> /dev/null
then
- for HOOK in config/chroot_localhooks/*
+ for HOOK in config/chroot_local-hooks/*
do
# Copying hook
cp "${HOOK}" chroot/root
@@ -68,5 +68,5 @@ then
done
# Creating stage file
- Create_stagefile .stage/chroot_localhooks
+ Create_stagefile .stage/chroot_local-hooks
fi
diff --git a/helpers/lh_chroot_localincludes b/helpers/lh_chroot_local-includes
index 40e9a76d2..0d94703bd 100755
--- a/helpers/lh_chroot_localincludes
+++ b/helpers/lh_chroot_local-includes
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_chroot_localincludes(1) - copy local files into chroot
+# lh_chroot_local-includes(1) - copy local files into chroot
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -32,13 +32,13 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_localincludes: Init"
+Breakpoint "chroot_local-includes: Init"
# Requiring stage file
Require_stagefile .stage/bootstrap
# Checking stage file
-Check_stagefile .stage/chroot_localincludes
+Check_stagefile .stage/chroot_local-includes
# Checking lock file
Check_lockfile .lock
@@ -46,13 +46,13 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if ls config/chroot_localincludes/* &> /dev/null
+if ls config/chroot_local-includes/* &> /dev/null
then
# Copying includes
- cd config/chroot_localincludes
+ cd config/chroot_local-includes
find . | cpio -dmpu "${OLDPWD}"/chroot
cd "${OLDPWD}"
# Creating stage file
- Create_stagefile .stage/chroot_localincludes
+ Create_stagefile .stage/chroot_local-includes
fi
diff --git a/helpers/lh_chroot_localpackages b/helpers/lh_chroot_local-packages
index 516e08a21..07c9eb2e3 100755
--- a/helpers/lh_chroot_localpackages
+++ b/helpers/lh_chroot_local-packages
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_chroot_localpackages(1) - install local packages into chroot
+# lh_chroot_local-packages(1) - install local packages into chroot
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -32,13 +32,13 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_localpackages: Init"
+Breakpoint "chroot_local-packages: Init"
# Requiring stage file
Require_stagefile .stage/bootstrap
# Checking stage file
-Check_stagefile .stage/chroot_localpackages
+Check_stagefile .stage/chroot_local-packages
# Checking lock file
Check_lockfile .lock
@@ -46,17 +46,17 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if ls config/chroot_localpackages/*.deb &> /dev/null
+if ls config/chroot_local-packages/*.deb &> /dev/null
then
# Restoring cache
- Restore_cache cache/packages_localpackages
+ Restore_cache cache/packages_local-packages
# Copying packages
- cp config/chroot_localpackages/*.deb chroot/root
+ cp config/chroot_local-packages/*.deb chroot/root
# Installing packages
- Chroot "find /root -name *.deb" > chroot/root/localpackages
- Chroot "xargs --arg-file=/root/localpackages dpkg -i" || true
+ Chroot "find /root -name *.deb" > chroot/root/local-packages
+ Chroot "xargs --arg-file=/root/local-packages dpkg -i" || true
# Cleaning dependencies
case "${LH_APT}" in
@@ -71,11 +71,11 @@ then
# Removing package files
rm -f chroot/root/*.deb
- rm -f chroot/root/localpackages
+ rm -f chroot/root/local-packages
# Saving cache
- Save_cache cache/packages_localpackages
+ Save_cache cache/packages_local-packages
# Creating stage file
- Create_stagefile .stage/chroot_localpackages
+ Create_stagefile .stage/chroot_local-packages
fi
diff --git a/helpers/lh_chroot_localpackageslists b/helpers/lh_chroot_local-packageslists
index 4cda34ecd..f358fca87 100755
--- a/helpers/lh_chroot_localpackageslists
+++ b/helpers/lh_chroot_local-packageslists
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_chroot_localpackageslists(1) - install local packages lists into chroot
+# lh_chroot_local-packageslists(1) - install local packages lists into chroot
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -32,13 +32,13 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "chroot_localpackageslists: Init"
+Breakpoint "chroot_local-packageslists: Init"
# Requiring stage file
Require_stagefile .stage/bootstrap
# Checking stage file
-Check_stagefile .stage/chroot_localpackageslists
+Check_stagefile .stage/chroot_local-packageslists
# Checking lock file
Check_lockfile .lock
@@ -46,12 +46,12 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if ls config/chroot_localpackageslists/* &> /dev/null
+if ls config/chroot_local-packageslists/* &> /dev/null
then
# Restoring cache
- Restore_cache cache/packages_localpackageslists
+ Restore_cache cache/packages_local-packageslists
- for PACKAGESLIST in config/chroot_localpackageslists/*
+ for PACKAGESLIST in config/chroot_local-packageslists/*
do
# Copying package list
grep -v "^#" "${PACKAGESLIST}" > chroot/root/"`basename ${PACKAGESLIST}`"
@@ -72,8 +72,8 @@ then
done
# Saving cache
- Save_cache cache/packages_localpackageslists
+ Save_cache cache/packages_local-packageslists
# Creating stage file
- Create_stagefile .stage/chroot_localpackageslists
+ Create_stagefile .stage/chroot_local-packageslists
fi
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index cb8962715..bdbe85611 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -49,11 +49,11 @@ case "${1}" in
Create_lockfile .lock
# Configure custom sources.list
- echo "deb ${LIVE_MIRROR_BUILD} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
+ echo "deb ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
if [ "${LIVE_SOURCE}" = "enabled" ]
then
- echo "deb-src ${LIVE_MIRROR_BUILD} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LIVE_MIRROR_BOOTSTRAP} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
fi
if [ "${LIVE_SECURITY}" = "enabled" ]
@@ -62,74 +62,74 @@ case "${1}" in
debian)
if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
then
- echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
if [ "${LIVE_SOURCE}" = "enabled" ]
then
- echo "deb-src ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
fi
fi
;;
ubuntu)
- echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
if [ "${LIVE_SOURCE}" = "enabled" ]
then
- echo "deb-src ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LIVE_MIRROR_BOOTSTRAP_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
fi
;;
esac
fi
# Check local sources.list
- if ls config/chroot_sources/*.build &> /dev/null
+ if ls config/chroot_sources/*.bootstrap &> /dev/null
then
echo "" >> chroot/etc/apt/sources.list
echo "# Custom repositories" >> chroot/etc/apt/sources.list
- for FILE in config/chroot_sources/*.build
+ for FILE in config/chroot_sources/*.bootstrap
do
cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
done
fi
# Update indices from cache
- if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_build ]
+ if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_bootstrap ]
then
- if ls cache/indices_build/secring.gpg* &> /dev/null
+ if ls cache/indices_bootstrap/secring.gpg* &> /dev/null
then
- cp -f cache/indices_build/secring.gpg* chroot/etc/apt
+ cp -f cache/indices_bootstrap/secring.gpg* chroot/etc/apt
fi
- if ls cache/indices_build/trusted.gpg* &> /dev/null
+ if ls cache/indices_bootstrap/trusted.gpg* &> /dev/null
then
- cp -f cache/indices_build/trusted.gpg* chroot/etc/apt
+ cp -f cache/indices_bootstrap/trusted.gpg* chroot/etc/apt
fi
- if [ -f cache/indices_build/pkgcache.bin ]
+ if [ -f cache/indices_bootstrap/pkgcache.bin ]
then
- cp -f cache/indices_build/pkgcache.bin chroot/var/cache/apt
+ cp -f cache/indices_bootstrap/pkgcache.bin chroot/var/cache/apt
fi
- if [ -f cache/indices_build/srcpkgcache.bin ]
+ if [ -f cache/indices_bootstrap/srcpkgcache.bin ]
then
- cp -f cache/indices_build/srcpkgcache.bin chroot/var/cache/apt
+ cp -f cache/indices_bootstrap/srcpkgcache.bin chroot/var/cache/apt
fi
- if ls cache/indices_build/*_Packages &> /dev/null
+ if ls cache/indices_bootstrap/*_Packages &> /dev/null
then
- cp -f cache/indices_build/*_Packages chroot/var/lib/apt/lists
+ cp -f cache/indices_bootstrap/*_Packages chroot/var/lib/apt/lists
fi
- if ls cache/indices_build/*_Sources &> /dev/null
+ if ls cache/indices_bootstrap/*_Sources &> /dev/null
then
- cp -f cache/indices_build/*_Sources chroot/var/lib/apt/lists
+ cp -f cache/indices_bootstrap/*_Sources chroot/var/lib/apt/lists
fi
- if ls cache/indices_build/*_Release* &> /dev/null
+ if ls cache/indices_bootstrap/*_Release* &> /dev/null
then
- cp -f cache/indices_build/*_Release* chroot/var/lib/apt/lists
+ cp -f cache/indices_bootstrap/*_Release* chroot/var/lib/apt/lists
fi
if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
@@ -138,9 +138,9 @@ case "${1}" in
fi
else # Get fresh indices
# Check local gpg keys
- if ls config/chroot_sources/*.build.gpg &> /dev/null
+ if ls config/chroot_sources/*.bootstrap.gpg &> /dev/null
then
- for FILE in config/chroot_sources/*.build.gpg
+ for FILE in config/chroot_sources/*.bootstrap.gpg
do
cp ${FILE} chroot/root
Chroot "apt-key add /root/`basename ${FILE}`"
@@ -183,20 +183,20 @@ case "${1}" in
if [ "${LH_CACHE_INDICES}" = "enabled" ]
then
- if [ ! -d cache/indices_build ]
+ if [ ! -d cache/indices_bootstrap ]
then
- mkdir -p cache/indices_build
+ mkdir -p cache/indices_bootstrap
fi
- cp -f chroot/etc/apt/secring.gpg* cache/indices_build
- cp -f chroot/etc/apt/trusted.gpg* cache/indices_build
+ cp -f chroot/etc/apt/secring.gpg* cache/indices_bootstrap
+ cp -f chroot/etc/apt/trusted.gpg* cache/indices_bootstrap
- cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_build
- cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_build
+ cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_bootstrap
+ cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_bootstrap
- cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_build
- cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_build
- cp -f chroot/var/lib/apt/*_Release* cache/indices_build
+ cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_bootstrap
+ cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_bootstrap
+ cp -f chroot/var/lib/apt/*_Release* cache/indices_bootstrap
fi
fi
@@ -212,11 +212,11 @@ case "${1}" in
Create_lockfile .lock
# Configure generic indices
- if [ "${LH_APT_GENERIC}" = "enabled" ]
+ if [ "${LIVE_BINARY_INDICES}" = "enabled" ]
then
# Don't do anything if it's not required
- if [ "${LIVE_MIRROR_BUILD}" = "${LIVE_MIRROR_IMAGE}" ] && \
- [ "${LIVE_MIRROR_BUILD_SECURITY}" = "${LIVE_MIRROR_IMAGE_SECURITY}" ]
+ if [ "${LIVE_MIRROR_BOOTSTRAP}" = "${LIVE_MIRROR_BINARY}" ] && \
+ [ "${LIVE_MIRROR_BOOTSTRAP_SECURITY}" = "${LIVE_MIRROR_BINARY_SECURITY}" ]
then
exit 0
fi
@@ -225,11 +225,11 @@ case "${1}" in
rm -rf chroot/var/lib/apt/lists
mkdir -p chroot/var/lib/apt/lists/partial
- echo "deb ${LIVE_MIRROR_IMAGE} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
+ echo "deb ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
if [ "${LIVE_SOURCE}" = "enabled" ]
then
- echo "deb-src ${LIVE_MIRROR_IMAGE} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LIVE_MIRROR_BINARY} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
fi
if [ "${LIVE_SECURITY}" = "enabled" ]
@@ -238,42 +238,42 @@ case "${1}" in
debian)
if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
then
- echo "deb ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
if [ "${LIVE_SOURCE}" = "enabled" ]
then
- echo "deb-src ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
fi
fi
;;
ubuntu)
- echo "deb ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
if [ "${LIVE_SOURCE}" = "enabled" ]
then
- echo "deb-src ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+ echo "deb-src ${LIVE_MIRROR_BINARY_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
fi
;;
esac
fi
# Check local sources.list
- if ls config/chroot_sources/*.image &> /dev/null
+ if ls config/chroot_sources/*.binary &> /dev/null
then
echo "" >> chroot/etc/apt/sources.list
echo "# Custom repositories" >> chroot/etc/apt/sources.list
- for FILE in config/chroot_sources/*.image
+ for FILE in config/chroot_sources/*.binary
do
cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
done
fi
# Check local gpg keys
- if ls config/chroot_sources/*.image.gpg &> /dev/null
+ if ls config/chroot_sources/*.binary.gpg &> /dev/null
then
- for FILE in config/chroot_sources/*.image.gpg
+ for FILE in config/chroot_sources/*.binary.gpg
do
cp ${FILE} chroot/root
Chroot "apt-key add /root/`basename ${FILE}`"
diff --git a/helpers/lh_config b/helpers/lh_config
index 8e9e11754..5477dd006 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -57,6 +57,8 @@ Breakpoint "config: Init"
# Creating configuration directory
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
@@ -78,10 +80,6 @@ LH_APT_FTPPROXY="${LH_APT_FTPPROXY}"
# (Default: autodetected or empty)
LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}"
-# \$LH_APT_GENERIC: set apt/aptitude generic indices
-# (Default: ${LH_APT_GENERIC})
-LH_APT_GENERIC="${LH_APT_GENERIC}"
-
# \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
# (Default: ${LH_APT_PDIFFS})
LH_APT_PDIFFS="${LH_APT_PDIFFS}"
@@ -181,13 +179,21 @@ EOF
cat > "${LIVE_ROOT}"/config/chroot << EOF
# config/chroot: configuration for lh_chroot_*
-# \$LIVE_KERNEL_FLAVOUR: set the kernel flavour to use
+# \$LIVE_CHROOT_FILESYSTEM: set chroot filesystem
+# (Default: ${LIVE_CHROOT_FILESYSTEM})
+LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}"
+
+# \$LIVE_INTERACTIVE: set interactive build
+# (Default: ${LIVE_INTERACTIVE})
+LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
+
+# \$LIVE_LINUX_FLAVOURS: set the kernel flavour to use
# (Default: autodetected)
-LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}"
+LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}"
-# \$LIVE_KERNEL_PACKAGES: set the kernel packages to use
+# \$LIVE_LINUX_PACKAGES: set the kernel packages to use
# (Default: autodetected)
-LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}"
+LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}"
# \$LIVE_KEYRING_PACKAGES: set the keyring packages
# (Default: empty)
@@ -224,17 +230,13 @@ LIVE_SYMLINKS="${LIVE_SYMLINKS}"
# \$LIVE_SYSVINIT: enable sysvinit
# (Default: ${LIVE_SYSVINIT})
LIVE_SYSVINIT="${LIVE_SYSVINIT}"
-
-# \$LIVE_INTERACTIVE: set interactive build
-# (Default: ${LIVE_INTERACTIVE})
-LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
EOF
# Creating lh_chroot_* directories
-mkdir -p "${LIVE_ROOT}"/config/chroot_localhooks
-mkdir -p "${LIVE_ROOT}"/config/chroot_localincludes
-mkdir -p "${LIVE_ROOT}"/config/chroot_localpackages
-mkdir -p "${LIVE_ROOT}"/config/chroot_localpackageslists
+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_bootstrap_* configuration
@@ -257,21 +259,21 @@ LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}"
# (Default: ${LIVE_BOOTSTRAP_FLAVOUR})
LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}"
-# \$LIVE_MIRROR_BUILD: set the mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BUILD})
-LIVE_MIRROR_BUILD="${LIVE_MIRROR_BUILD}"
+# \$LIVE_MIRROR_BOOTSTRAP: set the mirror to fetch packages from
+# (Default: ${LIVE_MIRROR_BOOTSTRAP})
+LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}"
-# \$LIVE_MIRROR_BUILD_SECURITY: set the security mirror to fetch packages from
-# (Default: ${LIVE_MIRROR_BUILD_SECURITY})
-LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}"
+# \$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_IMAGE: set the mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_IMAGE})
-LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}"
+# \$LIVE_MIRROR_BINARY: set the mirror which ends up in the image
+# (Default: ${LIVE_MIRROR_BINARY})
+LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}"
-# \$LIVE_MIRROR_IMAGE_SECURITY: set the security mirror which ends up in the image
-# (Default: ${LIVE_MIRROR_IMAGE_SECURITY})
-LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}"
+# \$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})
@@ -282,6 +284,10 @@ EOF
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}"
+
# \$LIVE_BOOTAPPEND: set boot parameters
# (Default: empty)
LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}"
@@ -298,10 +304,6 @@ LIVE_USERNAME="${LIVE_USERNAME}"
# (Default: ${LIVE_HOSTNAME})
LIVE_HOSTNAME="${LIVE_HOSTNAME}"
-# \$LIVE_FILESYSTEM: set filesystem
-# (Default: ${LIVE_FILESYSTEM})
-LIVE_FILESYSTEM="${LIVE_FILESYSTEM}"
-
# \$LIVE_MEMTEST: set memtest
# (Default: ${LIVE_MEMTEST})
LIVE_MEMTEST="${LIVE_MEMTEST}"
@@ -314,13 +316,13 @@ LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
# (Default: ${LIVE_ISO_VOLUME})
LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"
-# \$LIVE_SERVER_ADDRESS: set the netboot server address
-# (Default: ${LIVE_SERVER_ADDRESS})
-LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}"
+# \$LIVE_NET_SERVER: set the netboot server address
+# (Default: ${LIVE_NET_SERVER})
+LIVE_NET_SERVER="${LIVE_NET_SERVER}"
-# \$LIVE_SERVER_PATH: set the netboot server directory
-# (Default: ${LIVE_SERVER_PATH})
-LIVE_SERVER_PATH="${LIVE_SERVER_PATH}"
+# \$LIVE_NET_PATH: set the netboot server directory
+# (Default: ${LIVE_NET_PATH})
+LIVE_NET_PATH="${LIVE_NET_PATH}"
# \$LIVE_BOOTLOADER: set bootloader
# (Default: ${LIVE_BOOTLOADER})
@@ -334,9 +336,9 @@ LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}"
# (Default: empty)
LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}"
-# \$LIVE_BINARY_IMAGE: set image type
-# (Default: ${LIVE_BINARY_IMAGE})
-LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}"
+# \$LIVE_BINARY_IMAGES: set image type
+# (Default: ${LIVE_BINARY_IMAGES})
+LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}"
EOF
# Creating lh_source_* configuration
@@ -347,12 +349,12 @@ cat > "${LIVE_ROOT}"/config/source << EOF
# (Default: ${LH_SOURCE})
LIVE_SOURCE="${LIVE_SOURCE}"
-# \$LIVE_SOURCE_IMAGE: set image type
-# (Default: ${LIVE_SOURCE_IMAGE})
-LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}"
+# \$LIVE_SOURCE_IMAGES: set image type
+# (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_localincludes
+mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
diff --git a/helpers/lh_source b/helpers/lh_source
index ff5df201f..56c18492b 100755
--- a/helpers/lh_source
+++ b/helpers/lh_source
@@ -40,8 +40,8 @@ lh_chroot_resolv install ${*}
lh_chroot_sources install ${*}
# Preparing images
-lh_source_config ${*}
-lh_source_download ${*}
+lh_source_debian-live ${*}
+lh_source_debian ${*}
lh_source_md5sum ${*}
# Building images
diff --git a/helpers/lh_source_download b/helpers/lh_source_debian
index cdae2c979..eb43e18d2 100755
--- a/helpers/lh_source_download
+++ b/helpers/lh_source_debian
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_source_download(1) - download sources
+# lh_source_debian(1) - download sources
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -16,7 +16,7 @@ do
done
# Set static variables
-DESCRIPTION="download sources"
+DESCRIPTION="debian sources"
HELP=""
USAGE="${PROGRAM} [--force]"
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "source_download: Init"
+Breakpoint "source_debian: Init"
if [ "${LIVE_SOURCE}" != "enabled" ]
then
@@ -43,7 +43,7 @@ fi
Require_stagefile .stage/bootstrap
# Checking stage file
-Check_stagefile .stage/source_download
+Check_stagefile .stage/source_debian
# Checking lock file
Check_lockfile .lock
@@ -87,4 +87,4 @@ do
done
# Creating stage file
-Create_stagefile .stage/source_download
+Create_stagefile .stage/source_debian
diff --git a/helpers/lh_source_config b/helpers/lh_source_debian-live
index 2c3db263b..06f9d86a3 100755
--- a/helpers/lh_source_config
+++ b/helpers/lh_source_debian-live
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_source_config(1) - copy debian-live config into source
+# lh_source_debian-live(1) - copy debian-live config into source
# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "source_config: Init"
+Breakpoint "source_debian-live: Init"
if [ "${LIVE_SOURCE}" != "enabled" ]
then
@@ -43,7 +43,7 @@ fi
Require_stagefile .stage/bootstrap
# Checking stage file
-Check_stagefile .stage/source_config
+Check_stagefile .stage/source_debian-live
# Checking lock file
Check_lockfile .lock
@@ -70,4 +70,4 @@ rm -rf source/debian-live/config
mv source/debian-live-config_*.tar.gz source/debian-live
# Creating stage file
-Create_stagefile .stage/source_config
+Create_stagefile .stage/source_debian-live
diff --git a/helpers/lh_source_generic b/helpers/lh_source_generic
index 6bd2a7770..4db80a017 100755
--- a/helpers/lh_source_generic
+++ b/helpers/lh_source_generic
@@ -39,12 +39,12 @@ then
exit 0
fi
-for IMAGE in ${LIVE_SOURCE_IMAGE}
+for IMAGE in ${LIVE_SOURCE_IMAGES}
do
if [ "${IMAGE}" = "generic" ]
then
# Requiring stage file
- Require_stagefile .stage/source_download
+ Require_stagefile .stage/source_debian
# Checking stage file
Check_stagefile .stage/source_generic
diff --git a/helpers/lh_source_hdd b/helpers/lh_source_hdd
index ac5ff730e..74b88891b 100755
--- a/helpers/lh_source_hdd
+++ b/helpers/lh_source_hdd
@@ -39,12 +39,12 @@ then
exit 0
fi
-for IMAGE in ${LIVE_SOURCE_IMAGE}
+for IMAGE in ${LIVE_SOURCE_IMAGES}
do
if [ "${IMAGE}" = "hdd" ]
then
# Requiring stage file
- Require_stagefile .stage/source_download
+ Require_stagefile .stage/source_debian
# Checking stage file
Check_stagefile .stage/source_hdd
diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso
index b00172787..078474785 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -32,19 +32,19 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-Breakpoint "source_iso: Init"
-
if [ "${LIVE_SOURCE}" != "enabled" ]
then
exit 0
fi
-for IMAGE in ${LIVE_SOURCE_IMAGE}
+for IMAGE in ${LIVE_SOURCE_IMAGES}
do
if [ "${IMAGE}" = "iso" ]
then
+ Breakpoint "source_iso: Init"
+
# Requiring stage file
- Require_stagefile .stage/source_download
+ Require_stagefile .stage/source_debian
# Checking stage file
Check_stagefile .stage/source_iso
@@ -55,14 +55,38 @@ do
# Creating lock file
Create_lockfile .lock
+ # Checking depends
+ Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
+
+ # Installing depends
+ Install_package
+
# Remove old source
if [ -f source.iso ]
then
rm -f source.iso
fi
- # Create image
- ${LH_GENISOIMAGE} -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -o source.iso -r -J -l -V "${LIVE_DISK_VOLUME}" source
+ if [ "${LH_VERBOSE}" = "enabled" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+ 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@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -V "${LIVE_ISO_VOLUME}" -o source.iso -r -J -l -cache-inodes source
+EOF
+
+ Chroot "sh source.sh"
+
+ # Move image
+ mv chroot/source chroot/source.iso ./
+ rm -f chroot/source.sh
+
+ # Removing depends
+ Remove_package
# Creating stage file
Create_stagefile .stage/source_iso
diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum
index 9569c22aa..e458ed848 100755
--- a/helpers/lh_source_md5sum
+++ b/helpers/lh_source_md5sum
@@ -40,7 +40,7 @@ then
fi
# Requiring stage file
-Require_stagefile .stage/source_download
+Require_stagefile .stage/source_debian
# Checking stage file
Check_stagefile .stage/source_md5sum
@@ -59,7 +59,8 @@ fi
# Calculating md5sums
cd source
-find . -type f -print0 | xargs -0 md5sum > md5sum.txt
+find . -type f | sort | xargs md5sum > ../md5sum.txt
+mv ../md5sum.txt ./
cd "${OLDPWD}"
# Creating stage file
diff --git a/helpers/lh_source_net b/helpers/lh_source_net
index 4b63befa1..90e519126 100755
--- a/helpers/lh_source_net
+++ b/helpers/lh_source_net
@@ -39,12 +39,12 @@ then
exit 0
fi
-for IMAGE in ${LIVE_SOURCE_IMAGE}
+for IMAGE in ${LIVE_SOURCE_IMAGES}
do
if [ "${IMAGE}" = "net" ]
then
# Requiring stage file
- Require_stagefile .stage/source_download
+ Require_stagefile .stage/source_debian
# Checking stage file
Check_stagefile .stage/source_net
diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd
index 4eca22a79..ec853a1d6 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -39,12 +39,12 @@ then
exit 0
fi
-for IMAGE in ${LIVE_SOURCE_IMAGE}
+for IMAGE in ${LIVE_SOURCE_IMAGES}
do
if [ "${IMAGE}" = "usb-hdd" ]
then
# Requiring stage file
- Require_stagefile .stage/source_download
+ Require_stagefile .stage/source_debian
# Checking stage file
Check_stagefile .stage/source_usb-hdd
diff --git a/helpers/make-live b/helpers/make-live
index 36546dd18..08e7cc116 100755
--- a/helpers/make-live
+++ b/helpers/make-live
@@ -31,13 +31,13 @@ done
# Set static variables
PROGRAM="`basename ${0}`"
DESCRIPTION="utility to build Debian Live systems"
-USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-build URL] [--mirror-build-security URL] [--mirror-image URL] [--mirror-image-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--kernel-flavour FLAVOUR] [--kernel-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-image hdd|iso|usb-hdd|net] [-s|--source-image generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
+USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
Local_arguments ()
{
- ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-build:,mirror-build-security:,mirror-image:,mirror-image-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-image:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
+ ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
if [ "${?}" != "0" ]
then
@@ -150,20 +150,20 @@ Local_arguments ()
LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2
;;
- -m|--mirror-build)
- LIVE_MIRROR_BUILD="${2}"; shift 2
+ -m|--mirror-bootstrap)
+ LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2
;;
- --mirror-build-security)
- LIVE_MIRROR_BUILD_SECURITY="${2}"; shift 2
+ --mirror-bootstrap-security)
+ LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2
;;
- --mirror-image)
- LIVE_MIRROR_IMAGE="${2}"; shift 2
+ --mirror-binary)
+ LIVE_MIRROR_BINARY="${2}"; shift 2
;;
- --mirror-image-security)
- LIVE_MIRROR_IMAGE_SECURITY="${2}"; shift 2
+ --mirror-binary-security)
+ LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2
;;
--sections)
@@ -175,12 +175,12 @@ Local_arguments ()
LIVE_INTERACTIVE="${2}"; shift 2
;;
- -k|--kernel-flavour)
- LIVE_KERNEL_FLAVOUR="${2}"; shift 2
+ -k|--linux-flavours)
+ LIVE_LINUX_FLAVOURS="${2}"; shift 2
;;
- --kernel-packages)
- LIVE_KERNEL_PACKAGES="${2}"; shift 2
+ --linux-packages)
+ LIVE_LINUX_PACKAGES="${2}"; shift 2
;;
--keyring-packages)
@@ -236,8 +236,8 @@ Local_arguments ()
LIVE_HOSTNAME="${2}"; shift 2
;;
- --filesystem)
- LIVE_FILESYSTEM="${2}"; shift 2
+ --chroot-filesystem)
+ LIVE_CHROOT_FILESYSTEM="${2}"; shift 2
;;
--memtest)
@@ -248,12 +248,12 @@ Local_arguments ()
LIVE_ISO_VOLUME="${2}"; shift 2
;;
- --server-address)
- LIVE_SERVER_ADDRESS="${2}"; shift 2
+ --net-server)
+ LIVE_NET_SERVER="${2}"; shift 2
;;
- --server-path)
- LIVE_SERVER_PATH="${2}"; shift 2
+ --net-path)
+ LIVE_NET_PATH="${2}"; shift 2
;;
--source)
@@ -272,12 +272,12 @@ Local_arguments ()
LIVE_SYSLINUX_SPLASH="${2}"; shift 2
;;
- -b|--binary-image)
- LIVE_BINARY_IMAGE="${2}"; shift 2
+ -b|--binary-images)
+ LIVE_BINARY_IMAGES="${2}"; shift 2
;;
- -s|--source-image)
- LIVE_SOURCE_IMAGE="${2}"; shift 2
+ -s|--source-images)
+ LIVE_SOURCE_IMAGES="${2}"; shift 2
;;
--includes)
@@ -353,7 +353,7 @@ Main ()
Local_arguments "${@}"
# Configuring (this is really shit!)
- LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BUILD="${LIVE_MIRROR_BUILD}" LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}" LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}" LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}" LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_FILESYSTEM="${LIVE_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" lh_config newconfig
+ LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" lh_config newconfig
if [ "${LH_BREAKPOINTS}" = "enabled" ]
then