From a43e4c72ce3a3ba07c1599a4e9b0782163685a9f Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Tue, 29 May 2012 17:03:16 +0200
Subject: default kernel: 3.2.0-24
---
auto/config | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/auto/config b/auto/config
index 7b9f07c..b889282 100755
--- a/auto/config
+++ b/auto/config
@@ -60,16 +60,16 @@ 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";;
+ amd64) LB_LINUX_PACKAGES="linux-image-3.2.0-24 linux-headers-3.2.0-24"; LB_LINUX_FLAVOURS="generic";;
+ i386) LB_LINUX_PACKAGES="linux-image-3.2.0-24 linux-headers-3.2.0-24"; LB_LINUX_FLAVOURS="generic";;
esac
;;
wheezy)
LB_PACKAGES_LISTS+=" dragonfire"
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";;
+ amd64) LB_LINUX_PACKAGES="linux-image-3.2.0-24 linux-headers-3.2.0-24"; LB_LINUX_FLAVOURS="generic";;
+ i386) LB_LINUX_PACKAGES="linux-image-3.2.0-24 linux-headers-3.2.0-24"; LB_LINUX_FLAVOURS="generic";;
esac
;;
esac
@@ -82,9 +82,6 @@ grep -wq -e opera <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" ope
grep -wq chrome <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" chrome"
lb config noauto --linux-packages "$LB_LINUX_PACKAGES" --linux-flavours "$LB_LINUX_FLAVOURS" --repositories "$LB_REPOSITORIES" -p "$LB_PACKAGES_LISTS"
-# Make sure config-arguments don't get overwritten by auto-configuration
-lb config noauto "${@}"
-
# Fetch kanotix-scripts if necessary
mkdir -p config/chroot_local-includes/usr/local/bin
grep -oe '^[^ #]*' scripts.urls | wget -i- -N -q -P config/chroot_local-includes/usr/local/bin
--
cgit v1.0