summaryrefslogtreecommitdiff
path: root/auto/config
diff options
context:
space:
mode:
authorAndreas Loibl <andreas@andreas-loibl.de>2012-02-29 23:36:50 +0100
committerAndreas Loibl <andreas@andreas-loibl.de>2012-02-29 23:38:13 +0100
commit2313d059f712fbe2f9465139d59ae7b8325cf221 (patch)
treef61ff19ab70fa5cae687b112f2c074256a173a2b /auto/config
parentf6c5c447f15b2fb3ae30a42f520c2129cccd9e34 (diff)
downloadkanotix-2313d059f712fbe2f9465139d59ae7b8325cf221.zip
kanotix-2313d059f712fbe2f9465139d59ae7b8325cf221.tar.gz
added compat for live-build 2/3
Diffstat (limited to 'auto/config')
-rwxr-xr-xauto/config40
1 files changed, 19 insertions, 21 deletions
diff --git a/auto/config b/auto/config
index 2eda1e3..9cc1c44 100755
--- a/auto/config
+++ b/auto/config
@@ -10,6 +10,7 @@ MIRROR_BOOTSTRAP="$MIRROR_CHROOT"
# preset kanotix defaults
export LB_PACKAGES_LISTS="kanotix-master"
+export LB_DISTRIBUTION="squeeze"
export LB_BOOTLOADER="syslinux"
export LB_SYSLINUX_MENU_LIVE_ENTRY="Kanotix"
export LB_LINUX_PACKAGES="linux-image linux-headers"
@@ -18,14 +19,14 @@ lb config noauto \
--iso-volume KANOTIX \
--iso-preparer kanotix.com \
--iso-publisher kanotix.com \
+ --binary-images iso-hybrid \
--chroot-filesystem squashfs \
--debian-installer false \
--apt apt \
--apt-recommends false \
--bootappend-live 'utc=no timezone=Europe/Berlin locales=de keyboard-layouts=de keyboard-variant=nodeadkeys splash' \
- --distribution squeeze \
--archive-areas "main contrib non-free" \
- --repositories "live.debian.net acritox hellfire lo wine-ppa firefox" \
+ --repositories "live.debian.net acritox hellfire lo" \
--security true \
--checksums md5 \
--syslinux-timeout 5 \
@@ -38,8 +39,7 @@ lb config noauto \
--mirror-binary ${MIRROR_BINARY} \
--mirror-binary-security ${MIRROR_BINARY_SECURITY} \
--binary-indices true \
- --backports true \
- "${@}"
+ "${@}" || exit $?
# hostname and username are configured in config/chroot_local-includes/etc/live/config.conf
#lb config noauto \
@@ -50,23 +50,21 @@ lb config noauto \
. config/bootstrap
. config/chroot
-# architecture depending stuff (e.g. kernel)
-case $LB_ARCHITECTURE in
-"amd64")
- lb config noauto \
- --linux-flavours generic \
- --linux-packages "linux-image-3.2.0-17 linux-headers-3.2.0-17"
- #--linux-packages "linux-image linux-headers"
- #--linux-flavours amd64 \
- #--linux-packages "linux-image-2.6 linux-headers-2.6"
+# architecture and distribution depending stuff (e.g. kernel)
+case "$LB_DISTRIBUTION" in
+squeeze)
+ LB_REPOSITORIES+=" firefox wine-ppa squeeze-backports"
+ case $LB_ARCHITECTURE in
+ amd64) LB_LINUX_PACKAGES="linux-image-3.2.0-17 linux-headers-3.2.0-17"; LB_LINUX_FLAVOURS="generic";;
+ i386) LB_LINUX_PACKAGES="linux-image-3.2.0-15 linux-headers-3.2.0-15"; LB_LINUX_FLAVOURS="generic";;
+ esac
;;
-"i386")
- lb config noauto \
- --linux-flavours generic \
- --linux-packages "linux-image-3.2.0-15 linux-headers-3.2.0-15"
- #--linux-packages "linux-image linux-headers"
- #--linux-flavours 686-bigmem \
- #--linux-packages "linux-image-2.6 linux-headers-2.6"
+wheezy)
+ LB_REPOSITORIES+=" dragonfire wine-ppa-oneiric"
+ case $LB_ARCHITECTURE in
+ amd64) LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="amd64";;
+ i386) LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="686-pae";;
+ esac
;;
esac
@@ -75,7 +73,7 @@ grep -wq trinity <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" trinity"
grep -wq -e virtualbox -e vbox <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" vbox"
grep -wq -e opera <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" opera"
grep -wq chrome <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" chrome"
-lb config noauto --repositories "$LB_REPOSITORIES"
+lb config noauto --linux-packages "$LB_LINUX_PACKAGES" --linux-flavours "$LB_LINUX_FLAVOURS" --repositories "$LB_REPOSITORIES"
# Fetch kanotix-scripts if necessary
mkdir -p config/chroot_local-includes/usr/local/bin