From 7af6d72a4d9c287ea6fc81d0958ee7283b1b7619 Mon Sep 17 00:00:00 2001 From: Andreas Loibl <andreas@andreas-loibl.de> Date: Fri, 18 May 2012 01:11:22 +0200 Subject: use dragonfire/wheezy as default --- auto/config | 4 ++-- config/chroot_apt/preferences | 12 ------------ config/chroot_local-hooks/XX_debpool | 2 +- scripts.urls | 2 -- 4 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 config/chroot_apt/preferences diff --git a/auto/config b/auto/config index 5f91186..b96539b 100755 --- a/auto/config +++ b/auto/config @@ -10,8 +10,8 @@ MIRROR_BOOTSTRAP="$MIRROR_CHROOT" # preset kanotix defaults export LB_PACKAGES_LISTS="kanotix-master" -export LB_DISTRIBUTION="squeeze" -export LB_BOOTLOADER="syslinux" +export LB_DISTRIBUTION="wheezy" +export LB_BOOTLOADER="grub2" export LB_SYSLINUX_MENU_LIVE_ENTRY="Kanotix" export LB_LINUX_PACKAGES="linux-image linux-headers" diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences deleted file mode 100644 index 6fa8836..0000000 --- a/config/chroot_apt/preferences +++ /dev/null @@ -1,12 +0,0 @@ -Package: * -Pin: release n=squeeze-backports -Pin-Priority: 500 - -Package: mdadm -Pin: release n=squeeze -Pin-Priority: 500 - -Package: plasma-widget-networkmanagement -Pin: release n=squeeze -Pin-Priority: 500 - diff --git a/config/chroot_local-hooks/XX_debpool b/config/chroot_local-hooks/XX_debpool index ff59f8c..cecdb95 100755 --- a/config/chroot_local-hooks/XX_debpool +++ b/config/chroot_local-hooks/XX_debpool @@ -3,7 +3,7 @@ [ -f /root/build.conf ] && . /root/build.conf [ -z "$LB_ARCHITECTURE" ] && LB_ARCHITECTURE=amd64 -[ -z "$LB_DISTRIBUTION" ] && LB_DISTRIBUTION=squeeze +[ -z "$LB_DISTRIBUTION" ] && LB_DISTRIBUTION=wheezy binary=/live/image/debian packages="$(cut -d'#' -f1 /live/packages | grep .)" diff --git a/scripts.urls b/scripts.urls index 8c9627a..791480e 100644 --- a/scripts.urls +++ b/scripts.urls @@ -1,7 +1,5 @@ # list of scripts that will be fetched to config/chroot_local-includes/usr/local/bin/ when "lb config" is called # they will be removed on "lb clean" http://kanotix.com/files/fix/update-scripts-kanotix.sh -http://kanotix.com/files/install-nvidia-debian.sh -http://kanotix.com/files/install-fglrx-debian.sh http://kanotix.com/files/install-flash-local.sh http://kanotix.acritox.com/files/enable_persistent_live.bash -- cgit v1.0