diff options
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/architectures.sh (renamed from functions/architecture.sh) | 14 | ||||
| -rwxr-xr-x | functions/conffile.sh | 2 | ||||
| -rwxr-xr-x | functions/defaults.sh | 40 |
3 files changed, 28 insertions, 28 deletions
diff --git a/functions/architecture.sh b/functions/architectures.sh index b49729348..07d4581cc 100755 --- a/functions/architecture.sh +++ b/functions/architectures.sh @@ -8,14 +8,14 @@ ## under certain conditions; see COPYING for details. -Check_architecture () +Check_architectures () { ARCHITECTURES="${@}" VALID="false" for ARCHITECTURE in ${ARCHITECTURES} do - if [ "$(echo ${LB_ARCHITECTURE} | grep ${ARCHITECTURE})" ] + if [ "$(echo ${LB_ARCHITECTURES} | grep ${ARCHITECTURE})" ] then VALID="true" break @@ -24,12 +24,12 @@ Check_architecture () if [ "${VALID}" = "false" ] then - Echo_warning "skipping %s, foreign architecture." "${0}" + Echo_warning "skipping %s, foreign architecture(s)." "${0}" exit 0 fi } -Check_crossarchitecture () +Check_crossarchitectures () { if [ -x /usr/bin/dpkg ] then @@ -52,12 +52,12 @@ Check_crossarchitecture () ;; esac - Check_architecture "${CROSS}" + Check_architectures "${CROSS}" } -Check_multiarchitecture () +Check_multiarchitectures () { - if [ "$(echo ${LB_ARCHITECTURE} | wc -w)" -gt "1" ] + if [ "$(echo ${LB_ARCHITECTURES} | wc -w)" -gt "1" ] then # First, only support multiarch on iso case "${LB_BINARY_IMAGES}" in diff --git a/functions/conffile.sh b/functions/conffile.sh index 65a035794..72d028c84 100755 --- a/functions/conffile.sh +++ b/functions/conffile.sh @@ -16,7 +16,7 @@ Get_conffiles () else for FILE in ${@} do - FILES="${FILES} ${FILE} ${FILE}.${LB_ARCHITECTURE} ${FILE}.${DISTRIBUTION}" + FILES="${FILES} ${FILE} ${FILE}.${LB_ARCHITECTURES} ${FILE}.${DISTRIBUTION}" FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||')" FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${ARCHITECTURE}" FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${DISTRIBUTION}" diff --git a/functions/defaults.sh b/functions/defaults.sh index 42d18bcc4..5419ca10a 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -245,22 +245,22 @@ Set_defaults () ## config/bootstrap # Setting architecture value - if [ -z "${LB_ARCHITECTURE}" ] + if [ -z "${LB_ARCHITECTURES}" ] then if [ -x "/usr/bin/dpkg" ] then - LB_ARCHITECTURE="$(dpkg --print-architecture)" + LB_ARCHITECTURES="$(dpkg --print-architecture)" else case "$(uname -m)" in sparc|powerpc) - LB_ARCHITECTURE="$(uname -m)" + LB_ARCHITECTURES="$(uname -m)" ;; x86_64) - LB_ARCHITECTURE="amd64" + LB_ARCHITECTURES="amd64" ;; *) Echo_warning "Can't determine architecture, assuming i386" - LB_ARCHITECTURE="i386" + LB_ARCHITECTURES="i386" ;; esac fi @@ -298,7 +298,7 @@ Set_defaults () ;; ubuntu) - case "${LB_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BOOTSTRAP="http://archive.ubuntu.com/ubuntu/" ;; @@ -326,7 +326,7 @@ Set_defaults () ;; ubuntu) - case "${LB_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_CHROOT_SECURITY="http://security.ubuntu.com/ubuntu/" ;; @@ -356,7 +356,7 @@ Set_defaults () ;; ubuntu) - case "${LB_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_CHROOT_VOLATILE="http://security.ubuntu.com/ubuntu/" ;; @@ -400,7 +400,7 @@ Set_defaults () ;; ubuntu) - case "${LB_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BINARY="http://archive.ubuntu.com/ubuntu/" ;; @@ -426,7 +426,7 @@ Set_defaults () ;; ubuntu) - case "${LB_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BINARY_SECURITY="http://archive.ubuntu.com/ubuntu/" ;; @@ -455,7 +455,7 @@ Set_defaults () ;; ubuntu) - case "${LB_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BINARY_VOLATILE="http://security.ubuntu.com/ubuntu/" ;; @@ -542,7 +542,7 @@ Set_defaults () # Setting linux flavour string if [ -z "${LB_LINUX_FLAVOURS}" ] then - case "${LB_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in armel) Echo_error "There is no default kernel flavour defined for your architecture." Echo_error "Please configure it manually with 'lb config -k FLAVOUR'." @@ -552,7 +552,7 @@ Set_defaults () alpha) case "${LB_MODE}" in ubuntu) - Echo_error "Architecture ${LB_ARCHITECTURE} not supported on Ubuntu." + Echo_error "Architecture(s) ${LB_ARCHITECTURES} not supported on Ubuntu." exit 1 ;; @@ -613,7 +613,7 @@ Set_defaults () s390) case "${LB_MODE}" in ubuntu) - Echo_error "Architecture ${LB_ARCHITECTURE} not supported on Ubuntu." + Echo_error "Architecture(s) ${LB_ARCHITECTURES} not supported on Ubuntu." exit 1 ;; @@ -628,7 +628,7 @@ Set_defaults () ;; *) - Echo_error "Architecture ${LB_ARCHITECTURE} not yet supported (FIXME)" + Echo_error "Architecture(s) ${LB_ARCHITECTURES} not yet supported (FIXME)" exit 1 ;; esac @@ -788,7 +788,7 @@ Set_defaults () ## config/binary # Setting image filesystem - case "${LB_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in sparc) LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-ext2}" ;; @@ -801,7 +801,7 @@ Set_defaults () # Setting image type case "${LB_DISTRIBUTION}" in squeeze|sid) - case "${LB_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_BINARY_IMAGES="${LB_BINARY_IMAGES:-iso-hybrid}" ;; @@ -828,7 +828,7 @@ Set_defaults () # Setting bootloader if [ -z "${LB_BOOTLOADER}" ] then - case "${LB_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_BOOTLOADER="syslinux" ;; @@ -992,7 +992,7 @@ Set_defaults () debian-release) eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`" - LB_ISO_VOLUME="Debian ${VERSION} ${LB_ARCHITECTURE} live" + LB_ISO_VOLUME="Debian ${VERSION} ${LB_ARCHITECTURES} live" ;; emdebian) @@ -1011,7 +1011,7 @@ Set_defaults () # Setting win32-loader option if [ "${LB_MODE}" != "ubuntu" ] then - case "${LB_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) if [ "${LB_DEBIAN_INSTALLER}" != "false" ] then |