Allow slashes in DEBIAN_MIRROR and use it on server

grml · May 10, 2011 · 84a9ea8 · 84a9ea8
1 parent a858abd
commit 84a9ea8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/scripts/netscript.sh b/scripts/netscript.sh
@@ -50,6 +50,7 @@ get_fai_config() {
 }
 
 software_install() {
+  sed -i "s;cdn.debian.net;${DEBIAN_MIRROR};" /etc/apt/sources.list.d/debian.list
   if [ -z "$FAI_MIRROR" ] ; then
     log "Configuration \$FAI_MIRROR unset, skipping sources.list step."
   else
@@ -210,7 +211,7 @@ fai_conf() {
 
   sed -i "s;FAI_DEBOOTSTRAP=.*;FAI_DEBOOTSTRAP=\"lenny http://${DEBIAN_MIRROR}/debian\";" \
       /etc/fai/make-fai-nfsroot.conf
-  sed -i "s/cdn.debian.net/${DEBIAN_MIRROR}/" /etc/fai/apt/sources.list
+  sed -i "s;cdn.debian.net;${DEBIAN_MIRROR};" /etc/fai/apt/sources.list
 
   # make sure new FAI version is available inside nfsroot as well
   if ! grep -q '^# FAI deployment script' /etc/fai/apt/sources.list ; then