[SCM] live-helper branch, debian-next, updated. debian/2.0_a7-1-10-g1e6ccc7
Daniel Baumann
daniel at debian.org
Thu Feb 18 16:39:57 UTC 2010
The following commit has been merged in the debian-next branch:
commit 1e6ccc752efa018fe84a05a0dbac7f2afe7201ba
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Feb 18 17:34:29 2010 +0100
Adding iso-hybrid as a binary flavour, part 1.
diff --git a/functions/architecture.sh b/functions/architecture.sh
index cd8e073..9f18ad4 100755
--- a/functions/architecture.sh
+++ b/functions/architecture.sh
@@ -59,28 +59,29 @@ Check_multiarchitecture ()
if [ "$(echo ${LH_ARCHITECTURE} | wc -w)" -gt "1" ]
then
# First, only support multiarch on iso
- if [ "${LH_BINARY_IMAGES}" = "iso" ]
- then
- # Assemble multi-arch
- case "${LH_CURRENT_ARCHITECTURE}" in
- amd64)
- DESTDIR="${DESTDIR}.amd"
- DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
- DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
- ;;
+ case "${LH_BINARY_IMAGES}" in
+ iso*)
+ # Assemble multi-arch
+ case "${LH_CURRENT_ARCHITECTURE}" in
+ amd64)
+ DESTDIR="${DESTDIR}.amd"
+ DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
+ DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
+ ;;
- i386)
- DESTDIR="${DESTDIR}.386"
- DESTDIR_LIVE="${DESTDIR_LIVE}.386"
- DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
- ;;
+ i386)
+ DESTDIR="${DESTDIR}.386"
+ DESTDIR_LIVE="${DESTDIR_LIVE}.386"
+ DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
+ ;;
- powerpc)
- DESTDIR="${DESTDIR}.ppc"
- DESTDIR_LIVE="${DESTDIR_LIVE}.ppc"
- DESTDIR_INSTALL="${DESTDIR_INSTALL}.ppc"
- ;;
- esac
- fi
+ powerpc)
+ DESTDIR="${DESTDIR}.ppc"
+ DESTDIR_LIVE="${DESTDIR_LIVE}.ppc"
+ DESTDIR_INSTALL="${DESTDIR_INSTALL}.ppc"
+ ;;
+ esac
+ ;;
+ esac
fi
}
diff --git a/functions/defaults.sh b/functions/defaults.sh
index a5712b7..dbd1d4e 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -753,7 +753,7 @@ Set_defaults ()
if [ -n "${LH_DEBIAN_INSTALLER_PRESEEDFILE}" ]
then
case "${LH_BINARY_IMAGES}" in
- iso)
+ iso*)
_LH_BOOTAPPEND_PRESEED="file=/cdrom/install/${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
;;
diff --git a/helpers/binary_disk b/helpers/binary_disk
index 8116734..b6edf4a 100755
--- a/helpers/binary_disk
+++ b/helpers/binary_disk
@@ -24,7 +24,7 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi
Set_defaults
case "${LH_BINARY_IMAGES}" in
- iso|usb*)
+ iso*)
;;
*)
exit 0
diff --git a/helpers/binary_grub b/helpers/binary_grub
index b3f9ba1..373d64e 100755
--- a/helpers/binary_grub
+++ b/helpers/binary_grub
@@ -128,7 +128,7 @@ esac
# Setting destination directory
case "${LH_BINARY_IMAGES}" in
- iso|tar)
+ iso*|tar)
case "${LH_INITRAMFS}" in
casper)
DESTDIR_LIVE="binary/casper"
@@ -276,7 +276,7 @@ mkdir -p binary/boot/grub
cp -r "${TEMPLATES}"/* binary/boot/grub
case ${LH_BINARY_IMAGES} in
- iso)
+ iso*)
FILES="chroot/usr/lib/grub/*/stage2_eltorito"
;;
diff --git a/helpers/binary_grub2 b/helpers/binary_grub2
index 0cf0618..7a7b26e 100755
--- a/helpers/binary_grub2
+++ b/helpers/binary_grub2
@@ -102,7 +102,7 @@ esac
# Setting destination directory
case "${LH_BINARY_IMAGES}" in
- iso|tar)
+ iso*|tar)
case "${LH_INITRAMFS}" in
casper)
DESTDIR_LIVE="binary/casper"
@@ -249,7 +249,7 @@ mkdir -p binary/boot/grub
cp -r "${TEMPLATES}"/* binary/boot/grub
case ${LH_BINARY_IMAGES} in
- iso)
+ iso*)
FILES="chroot/usr/lib/grub/i386-pc/*.mod chroot/usr/lib/grub/i386-pc/*.lst chroot/usr/lib/grub/i386-pc/efiemu??.o chroot/usr/share/grub/*.pf2"
;;
diff --git a/helpers/binary_iso b/helpers/binary_iso
index 4012a70..67391fb 100755
--- a/helpers/binary_iso
+++ b/helpers/binary_iso
@@ -23,10 +23,14 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if ! In_list iso "${LH_BINARY_IMAGES}"
-then
- exit 0
-fi
+case "${LH_BINARY_IMAGES}" in
+ iso*)
+ ;;
+
+ *)
+ exit 0
+ ;;
+esac
Echo_message "Begin building binary iso image..."
diff --git a/helpers/binary_silo b/helpers/binary_silo
index df7ee10..356c47e 100755
--- a/helpers/binary_silo
+++ b/helpers/binary_silo
@@ -30,7 +30,7 @@ fi
# Check image type
case "${LH_BINARY_IMAGES}" in
- iso|usb*|tar)
+ iso*|usb*|tar)
;;
net)
@@ -225,7 +225,7 @@ fi
LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
case "${LH_BINARY_IMAGES}" in
- iso|usb*)
+ iso*|usb*)
# Copying silo
mkdir -p binary/boot
diff --git a/helpers/binary_syslinux b/helpers/binary_syslinux
index 9d4cab1..4fa2805 100755
--- a/helpers/binary_syslinux
+++ b/helpers/binary_syslinux
@@ -90,7 +90,7 @@ Syslinux_live_entry ()
APPEND="${5}"
case "${LH_BINARY_IMAGES}" in
- iso|usb*)
+ iso*|usb*)
NUMBER="$(ls -1 ${KERNEL_PATH} | grep 'vmlinuz[0-9]\+$' | wc -l)"
NUMBER="$((${NUMBER} +1))"
@@ -363,7 +363,7 @@ esac
# Setting boot method specific variables
case "${LH_BINARY_IMAGES}" in
- iso)
+ iso*)
SYSLINUX_PATH="binary/isolinux"
KERNEL_PATH="binary/${INITFS}"
SCREEN_PATH="${SYSLINUX_PATH}"
@@ -581,7 +581,7 @@ Configure_syslinux_templates
# Configure syslinux setup per boot method
case "${LH_BINARY_IMAGES}" in
- iso)
+ iso*)
case "${LH_CHROOT_BUILD}" in
true)
cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}
diff --git a/helpers/binary_yaboot b/helpers/binary_yaboot
index ef44e6e..b896eac 100755
--- a/helpers/binary_yaboot
+++ b/helpers/binary_yaboot
@@ -135,7 +135,7 @@ esac
# Setting destination directory
case "${LH_BINARY_IMAGES}" in
- iso)
+ iso*)
case "${LH_INITRAMFS}" in
casper)
DESTDIR_LIVE="binary/casper"
@@ -272,7 +272,7 @@ fi
LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
case "${LH_BINARY_IMAGES}" in
- iso|usb*)
+ iso*|usb*)
# Copying yaboot
mkdir -p binary/yaboot
diff --git a/helpers/source_disk b/helpers/source_disk
index a765bb4..50db471 100755
--- a/helpers/source_disk
+++ b/helpers/source_disk
@@ -23,10 +23,14 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LH_SOURCE_IMAGES}" != "iso" ]
-then
- exit 0
-fi
+case "${LH_SOURCE_IMAGES}" in
+ iso*)
+ ;;
+
+ *)
+ exit 0
+ ;;
+esac
Echo_message "Begin installing disk information..."
diff --git a/helpers/source_iso b/helpers/source_iso
index 0ef1bcb..0752ebe 100755
--- a/helpers/source_iso
+++ b/helpers/source_iso
@@ -28,10 +28,14 @@ then
exit 0
fi
-if ! In_list iso "${LH_SOURCE_IMAGES}"
-then
- exit 0
-fi
+case "${LH_SOURCE_IMAGES}" in
+ iso*)
+ ;;
+
+ *)
+ exit 0
+ ;;
+esac
Echo_message "Begin building source iso image..."
--
live-helper
More information about the debian-live-changes
mailing list