Expliclity setting linux flavours to not rely on internal live-build defaults.

diff --git a/images/gnome-desktop/auto/config b/images/gnome-desktop/auto/config
index cb89518..9ebcb86 100755 (executable)
--- a/images/gnome-desktop/auto/config
+++ b/images/gnome-desktop/auto/config
@@ -2,4 +2,14 @@
 
 set -e
 
-lb config noauto --clean --ignore-system-defaults --mode debian --debian-installer live --linux-packages "linux-image linux-headers" "${@}"
+case "$(dpkg --print-architecture)" in
+       amd64)
+               _LINUX_FLAVOURS="amd64"
+               ;;
+
+       i386)
+               _LINUX_FLAVOURS="486 686-pae"
+               ;;
+esac
+
+lb config noauto --clean --ignore-system-defaults --mode debian --debian-installer live --linux-flavours "${_LINUX_FLAVOURS}" --linux-packages "linux-image linux-headers" "${@}"

diff --git a/images/kde-desktop/auto/config b/images/kde-desktop/auto/config
index cb89518..9ebcb86 100755 (executable)
--- a/images/kde-desktop/auto/config
+++ b/images/kde-desktop/auto/config
@@ -2,4 +2,14 @@
 
 set -e
 
-lb config noauto --clean --ignore-system-defaults --mode debian --debian-installer live --linux-packages "linux-image linux-headers" "${@}"
+case "$(dpkg --print-architecture)" in
+       amd64)
+               _LINUX_FLAVOURS="amd64"
+               ;;
+
+       i386)
+               _LINUX_FLAVOURS="486 686-pae"
+               ;;
+esac
+
+lb config noauto --clean --ignore-system-defaults --mode debian --debian-installer live --linux-flavours "${_LINUX_FLAVOURS}" --linux-packages "linux-image linux-headers" "${@}"

diff --git a/images/lxde-desktop/auto/config b/images/lxde-desktop/auto/config
index cb89518..9ebcb86 100755 (executable)
--- a/images/lxde-desktop/auto/config
+++ b/images/lxde-desktop/auto/config
@@ -2,4 +2,14 @@
 
 set -e
 
-lb config noauto --clean --ignore-system-defaults --mode debian --debian-installer live --linux-packages "linux-image linux-headers" "${@}"
+case "$(dpkg --print-architecture)" in
+       amd64)
+               _LINUX_FLAVOURS="amd64"
+               ;;
+
+       i386)
+               _LINUX_FLAVOURS="486 686-pae"
+               ;;
+esac
+
+lb config noauto --clean --ignore-system-defaults --mode debian --debian-installer live --linux-flavours "${_LINUX_FLAVOURS}" --linux-packages "linux-image linux-headers" "${@}"

diff --git a/images/rescue/auto/config b/images/rescue/auto/config
index ed80a39..9ebcb86 100755 (executable)
--- a/images/rescue/auto/config
+++ b/images/rescue/auto/config
@@ -2,4 +2,14 @@
 
 set -e
 
-lb config noauto --clean --ignore-system-defaults --mode debian --debian-installer live "${@}"
+case "$(dpkg --print-architecture)" in
+       amd64)
+               _LINUX_FLAVOURS="amd64"
+               ;;
+
+       i386)
+               _LINUX_FLAVOURS="486 686-pae"
+               ;;
+esac
+
+lb config noauto --clean --ignore-system-defaults --mode debian --debian-installer live --linux-flavours "${_LINUX_FLAVOURS}" --linux-packages "linux-image linux-headers" "${@}"

diff --git a/images/standard/auto/config b/images/standard/auto/config
index ed80a39..9ebcb86 100755 (executable)
--- a/images/standard/auto/config
+++ b/images/standard/auto/config
@@ -2,4 +2,14 @@
 
 set -e
 
-lb config noauto --clean --ignore-system-defaults --mode debian --debian-installer live "${@}"
+case "$(dpkg --print-architecture)" in
+       amd64)
+               _LINUX_FLAVOURS="amd64"
+               ;;
+
+       i386)
+               _LINUX_FLAVOURS="486 686-pae"
+               ;;
+esac
+
+lb config noauto --clean --ignore-system-defaults --mode debian --debian-installer live --linux-flavours "${_LINUX_FLAVOURS}" --linux-packages "linux-image linux-headers" "${@}"

diff --git a/images/xfce-desktop/auto/config b/images/xfce-desktop/auto/config
index cb89518..9ebcb86 100755 (executable)
--- a/images/xfce-desktop/auto/config
+++ b/images/xfce-desktop/auto/config
@@ -2,4 +2,14 @@
 
 set -e
 
-lb config noauto --clean --ignore-system-defaults --mode debian --debian-installer live --linux-packages "linux-image linux-headers" "${@}"
+case "$(dpkg --print-architecture)" in
+       amd64)
+               _LINUX_FLAVOURS="amd64"
+               ;;
+
+       i386)
+               _LINUX_FLAVOURS="486 686-pae"
+               ;;
+esac
+
+lb config noauto --clean --ignore-system-defaults --mode debian --debian-installer live --linux-flavours "${_LINUX_FLAVOURS}" --linux-packages "linux-image linux-headers" "${@}"