[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-3-geb0f8be

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit eb0f8be8ed0a3b7ee2e3eb971dc6ee22b33a2049
Author: Andreas B. Mundt <andi.mundt at web.de>
Date:   Mon Apr 23 18:06:55 2012 +0200

    Add local APT repository to '/etc/apt/sources.list.d/sources.list'.
    
    This ensures the added sources are not overwritten by the
    'sources.list' file provided in the FAI config space.
    Use www.intern as hostname for the machine providing the repository.
    The web server www.intern will provide the repository in general.

diff --git a/fai/config/class/CLIENT_A.var b/fai/config/class/CLIENT_A.var
index 7a5d399..38681f9 100644
--- a/fai/config/class/CLIENT_A.var
+++ b/fai/config/class/CLIENT_A.var
@@ -16,7 +16,7 @@ ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
 
 ## URL of the local site's APT repository.
 ## Set empty to skip this feature.
-APT_URL="http://mainserver/debian/"
+APT_URL="http://www.intern/debian/"
 
 # MODULESLIST contains modules that will be loaded by the new system,
 # not during installation these modules will be written to /etc/modules
diff --git a/fai/config/scripts/CLIENT_A/30-APTrepository b/fai/config/scripts/CLIENT_A/30-APTrepository
index dab49d3..a30a473 100755
--- a/fai/config/scripts/CLIENT_A/30-APTrepository
+++ b/fai/config/scripts/CLIENT_A/30-APTrepository
@@ -13,9 +13,10 @@ echo "Check if public key is available:"
 if $ROOTCMD wget -O /tmp/DebianLAN.pubkey $APT_URL/DebianLAN.pubkey ; then
     echo -n "Run apt-key and add key: "
     $ROOTCMD apt-key add /tmp/DebianLAN.pubkey
-    ## Key is available, add repository to sources.list.
-    ainsl $target/etc/apt/sources.list "## Local APT repository for site-specific packages:"
-    ainsl $target/etc/apt/sources.list "deb $APT_URL stable main"
+    ## Key is available, add repository to sources.list.d/.
+    FILE=$target/etc/apt/sources.list.d/local.list
+    ainsl -a $FILE "## Local APT repository for site-specific packages:"
+    ainsl $FILE "deb $APT_URL stable main"
 else
     echo "No key available."
 fi

-- 
Debian-LAN development and packaging