summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Paradies <retabell@gmx.de>2014-02-04 11:09:43 +0100
committerHolger Paradies <retabell@gmx.de>2014-02-11 15:15:46 +0100
commitb8131aa60b2536996c40d1b97a8d1d9a2c061f3f (patch)
tree3f9fa2ebe2cf6e9ea5d8a4b0a4e6043aa9a67963
parente3643095466d3b220a050b550adfbe3efa6a9749 (diff)
downloadkanotix-b8131aa60b2536996c40d1b97a8d1d9a2c061f3f.zip
kanotix-b8131aa60b2536996c40d1b97a8d1d9a2c061f3f.tar.gz
change default sources.list
-rwxr-xr-xauto/config7
-rw-r--r--config/repositories/dragonfire4
-rw-r--r--config/repositories/dragonfire-acritox3
3 files changed, 7 insertions, 7 deletions
diff --git a/auto/config b/auto/config
index 0466f4c..c8aac27 100755
--- a/auto/config
+++ b/auto/config
@@ -26,7 +26,7 @@ lb config noauto \
--apt-recommends false \
--bootappend-live 'utc=no timezone=Europe/Berlin locales=de keyboard-layouts=de keyboard-variant=nodeadkeys splash' \
--archive-areas "main contrib non-free" \
- --repositories "live.debian.net acritox hellfire lo" \
+ --repositories "live.debian.net lo" \
--security true \
--checksums md5 \
--syslinux-timeout 5 \
@@ -50,7 +50,7 @@ lb config noauto \
# architecture and distribution depending stuff (e.g. kernel)
case "$LB_DISTRIBUTION" in
squeeze)
- LB_REPOSITORIES+=" firefox wine-ppa squeeze-backports"
+ LB_REPOSITORIES+=" firefox wine-ppa squeeze-backports hellfire acritox"
case $LB_ARCHITECTURE in
amd64) LB_LINUX_PACKAGES="linux-image-3.2.0-30 linux-headers-3.2.0-30"; LB_LINUX_FLAVOURS="generic";;
i386) LB_LINUX_PACKAGES="linux-image-3.2.0-30 linux-headers-3.2.0-30"; LB_LINUX_FLAVOURS="generic";;
@@ -66,7 +66,8 @@ wheezy)
esac
[ "$LB_BOOTLOADER" = "burg" ] && LB_REPOSITORIES+=" burg"
-[ "$LB_BOOTLOADER" = "grub2" ] && LB_REPOSITORIES+=" grub2"
+grep -wq acritox <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" acritox dragonfire-acritox"
+grep -wq hellfire <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" hellfire"
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/repositories/dragonfire b/config/repositories/dragonfire
index 5236242..b89374c 100644
--- a/config/repositories/dragonfire
+++ b/config/repositories/dragonfire
@@ -1,7 +1,3 @@
# Kanotix Dragonfire
deb http://kanotix.com/files/dragonfire ./
deb-src http://kanotix.com/files/dragonfire ./
-
-# Kanotix Dragonfire unofficial (by acritox)
-deb http://kanotix.acritox.com/debian dragonfire main
-deb-src http://kanotix.acritox.com/debian dragonfire main
diff --git a/config/repositories/dragonfire-acritox b/config/repositories/dragonfire-acritox
new file mode 100644
index 0000000..b94610c
--- /dev/null
+++ b/config/repositories/dragonfire-acritox
@@ -0,0 +1,3 @@
+# Kanotix Dragonfire unofficial (by acritox)
+deb http://kanotix.acritox.com/debian dragonfire main
+deb-src http://kanotix.acritox.com/debian dragonfire main