From 7d46889242b05f379d425f806ee4415d83e059d5 Mon Sep 17 00:00:00 2001 From: Andreas Loibl Date: Sun, 4 Mar 2012 23:25:27 +0100 Subject: removed live-boot subdevices-order patch, added zevenos-neptune deb-src --- config/chroot_local-patches/live-boot_subdevices-order.patch | 11 ----------- config/repositories/zevenos | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 config/chroot_local-patches/live-boot_subdevices-order.patch diff --git a/config/chroot_local-patches/live-boot_subdevices-order.patch b/config/chroot_local-patches/live-boot_subdevices-order.patch deleted file mode 100644 index 2c0e03c..0000000 --- a/config/chroot_local-patches/live-boot_subdevices-order.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- live-boot-2.0.15.orig/scripts/live-helpers -+++ /usr/share/initramfs-tools/scripts/live-helpers -@@ -26,7 +26,7 @@ - sysblock=${1} - r="" - -- for dev in "${sysblock}" "${sysblock}"/* -+ for dev in "${sysblock}"/* "${sysblock}" - do - if [ -e "${dev}/dev" ] - then diff --git a/config/repositories/zevenos b/config/repositories/zevenos index 34bb116..cacde63 100644 --- a/config/repositories/zevenos +++ b/config/repositories/zevenos @@ -1,3 +1,4 @@ # Zevenos Neptune (KDE 4.8) deb http://zevenos.dyndns.org/repo sid main +deb-src http://zevenos.dyndns.org/repo sid main -- cgit v1.0 From 385fcc3ec334eb782f1cda8367946af698a70c1b Mon Sep 17 00:00:00 2001 From: Andreas Loibl Date: Mon, 5 Mar 2012 12:34:08 +0100 Subject: added KDE4.8 from acritox-kde48 backport repository --- auto/config | 1 + config/lists/kde48 | 3 +++ config/lists/zevenos | 3 --- config/repositories/acritox-kde48 | 3 +++ 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 config/lists/kde48 delete mode 100644 config/lists/zevenos create mode 100644 config/repositories/acritox-kde48 diff --git a/auto/config b/auto/config index dc1caab..bafb297 100755 --- a/auto/config +++ b/auto/config @@ -70,6 +70,7 @@ wheezy) esac [ "$LB_BOOTLOADER" = "burg" ] && LB_REPOSITORIES+=" burg" +grep -wq kde48 <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" acritox-kde48" 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" diff --git a/config/lists/kde48 b/config/lists/kde48 new file mode 100644 index 0000000..406f82a --- /dev/null +++ b/config/lists/kde48 @@ -0,0 +1,3 @@ +# additional packages needed for KDE4.8 from acritox-kde48 backport repository +phonon +konsole diff --git a/config/lists/zevenos b/config/lists/zevenos deleted file mode 100644 index 55cc2e7..0000000 --- a/config/lists/zevenos +++ /dev/null @@ -1,3 +0,0 @@ -# packages needed for KDE4.8 from Zevenos-Neptune repository -phonon -konsole diff --git a/config/repositories/acritox-kde48 b/config/repositories/acritox-kde48 new file mode 100644 index 0000000..8f2f709 --- /dev/null +++ b/config/repositories/acritox-kde48 @@ -0,0 +1,3 @@ +# KDE4.8 (backported by acritox) +deb http://kanotix.acritox.com/debian dragonfire main +deb-src http://kanotix.acritox.com/debian dragonfire main -- cgit v1.0 From 67531aca58d5eed1253cb54e422b712c23144f87 Mon Sep 17 00:00:00 2001 From: Joerg Schirottke Date: Mon, 5 Mar 2012 00:27:20 +0100 Subject: hotfix for live config 3: remove-xinit hook --- config/chroot_local-hooks/remove-xinit | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 config/chroot_local-hooks/remove-xinit diff --git a/config/chroot_local-hooks/remove-xinit b/config/chroot_local-hooks/remove-xinit new file mode 100755 index 0000000..22e14fd --- /dev/null +++ b/config/chroot_local-hooks/remove-xinit @@ -0,0 +1,6 @@ +#!/bin/sh +_X11=false +for x in gdm gdm3 kdm lightdm lxdm nodm slim; do + [ -f /var/lib/dpkg/info/$x.list ] && _X11=true || : +done +[ "$_X11" = "true" ] && rm -vf /lib/live/config/014-xinit || : -- cgit v1.0