diff options
| author | Andreas Loibl <andreas@andreas-loibl.de> | 2012-03-07 00:54:52 +0100 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2012-03-07 00:54:52 +0100 |
| commit | c0186754062c6c8380ce5a17a1cdc32092d504eb (patch) | |
| tree | 2fcdf2e6b47afe736c62a2f1230893e6b998b6ba /config | |
| parent | 08eb9168f73c76680b6fc257bc904bd24e688c5f (diff) | |
| parent | 67531aca58d5eed1253cb54e422b712c23144f87 (diff) | |
| download | kanotix-c0186754062c6c8380ce5a17a1cdc32092d504eb.zip kanotix-c0186754062c6c8380ce5a17a1cdc32092d504eb.tar.gz | |
Merge branch 'master' of ssh://git.acritox.com/kanotix
Diffstat (limited to 'config')
| -rwxr-xr-x | config/chroot_local-hooks/remove-xinit | 6 | ||||
| -rw-r--r-- | config/chroot_local-patches/live-boot_subdevices-order.patch | 11 | ||||
| -rw-r--r-- | config/lists/kde48 | 3 | ||||
| -rw-r--r-- | config/lists/zevenos | 3 | ||||
| -rw-r--r-- | config/repositories/acritox-kde48 | 3 | ||||
| -rw-r--r-- | config/repositories/zevenos | 1 |
6 files changed, 13 insertions, 14 deletions
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 || : 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/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 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 |