summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAndreas Loibl <andreas@andreas-loibl.de>2011-09-24 20:25:19 +0200
committerAndreas Loibl <andreas@andreas-loibl.de>2011-09-24 20:25:19 +0200
commit8fbf27aa417408a00462e8709b6a32d47f15fc26 (patch)
tree737a1313ce9e362951a64fd3161d4f2b97211a26 /config
parentd7a87ce78149d37afdbc62467b8a980668b02106 (diff)
downloadkanotix-8fbf27aa417408a00462e8709b6a32d47f15fc26.zip
kanotix-8fbf27aa417408a00462e8709b6a32d47f15fc26.tar.gz
Fix: sources.list didn't get combined when chroot_local-packages/*.deb were present
Diffstat (limited to 'config')
-rwxr-xr-xconfig/chroot_local-hooks/sources.list-format11
1 files changed, 11 insertions, 0 deletions
diff --git a/config/chroot_local-hooks/sources.list-format b/config/chroot_local-hooks/sources.list-format
index 7fcf14e..115cb71 100755
--- a/config/chroot_local-hooks/sources.list-format
+++ b/config/chroot_local-hooks/sources.list-format
@@ -1,6 +1,17 @@
#!/bin/bash
# update sources.list
+# Remove local package repository
+rm -f /etc/apt/sources.list.d/local-packages.list
+rm -rf /root/local-packages
+
+# Remove local packages key if it exists
+if apt-key list | grep -q "live-build-local-key@invalid"
+then
+ apt-key del "live-build-local-key@invalid"
+fi
+
+# Combine sources.list.d/*.list into a single sources.list file
if [ -d /etc/apt/sources.list.d ]; then
for repo in /etc/apt/sources.list.d/*
do