summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-02-18 17:34:29 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:04 +0100
commitc66942f06ed5dcebab29711afee6dcef8d865adf (patch)
tree52a5557cfe76cc3cc7e386e5b9b52436832e0a94 /functions
parent9d6a4dedc2736389349345c29d3a8a48b7b70692 (diff)
downloadvyos-live-build-c66942f06ed5dcebab29711afee6dcef8d865adf.tar.gz
vyos-live-build-c66942f06ed5dcebab29711afee6dcef8d865adf.zip
Reworking iso-hybrid as an independent binary image type.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/architecture.sh43
-rwxr-xr-xfunctions/defaults.sh21
2 files changed, 40 insertions, 24 deletions
diff --git a/functions/architecture.sh b/functions/architecture.sh
index cd8e073a8..9f18ad47e 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 a5712b75e..f46ec231d 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -669,8 +669,23 @@ Set_defaults ()
esac
# Setting image type
- LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso}"
- LH_BINARY_ISO_HYRBID="${LH_BINARY_ISO_HYBRID:-false}"
+ case "${LH_DISTRIBUTION}" in
+ squeeze|sid)
+ case "${LH_ARCHITECTURE}" in
+ amd64|i386)
+ LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso-hybrid}"
+ ;;
+
+ *)
+ LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso}"
+ ;;
+ esac
+ ;;
+
+ *)
+ LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso}"
+ ;;
+ esac
# Setting apt indices
if echo ${LH_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b"
@@ -753,7 +768,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}"
;;