summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rwxr-xr-xconfig/chroot_local-hooks/00-sources.list7
-rw-r--r--config/lists/google-chrome1
-rw-r--r--config/repositories/chrome2
-rw-r--r--config/repositories/google-chrome3
-rw-r--r--config/repositories/google-chrome.gpg (renamed from config/repositories/chrome.gpg)0
5 files changed, 10 insertions, 3 deletions
diff --git a/config/chroot_local-hooks/00-sources.list b/config/chroot_local-hooks/00-sources.list
index 49eaf04..976b539 100755
--- a/config/chroot_local-hooks/00-sources.list
+++ b/config/chroot_local-hooks/00-sources.list
@@ -1,5 +1,10 @@
#!/bin/sh
for file in /root/config/*; do [ -r $file ] && . $file; done
-sed -i -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" /etc/apt/sources.list
+for x in /etc/apt/sources.list.d/*.list; do
+ if grep -q '### THIS FILE IS AUTOMATICALLY CONFIGURED ###' $x; then
+ rm -f $x
+ fi
+done
+sed -i -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" /etc/apt/sources.list
diff --git a/config/lists/google-chrome b/config/lists/google-chrome
new file mode 100644
index 0000000..988464c
--- /dev/null
+++ b/config/lists/google-chrome
@@ -0,0 +1 @@
+google-chrome-stable
diff --git a/config/repositories/chrome b/config/repositories/chrome
deleted file mode 100644
index 012b0de..0000000
--- a/config/repositories/chrome
+++ /dev/null
@@ -1,2 +0,0 @@
-# Google Chrome
-deb http://dl.google.com/linux/chrome/deb/ stable main
diff --git a/config/repositories/google-chrome b/config/repositories/google-chrome
new file mode 100644
index 0000000..ab80a74
--- /dev/null
+++ b/config/repositories/google-chrome
@@ -0,0 +1,3 @@
+### THIS FILE IS AUTOMATICALLY CONFIGURED ###
+# You may comment out this entry, but any other modifications may be lost.
+deb http://dl.google.com/linux/chrome/deb/ stable main
diff --git a/config/repositories/chrome.gpg b/config/repositories/google-chrome.gpg
index d304031..d304031 100644
--- a/config/repositories/chrome.gpg
+++ b/config/repositories/google-chrome.gpg