fixed initVariablesApt()
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 26 Dec 2003 00:33:40 +0000 (00:33 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Fri, 26 Dec 2003 00:33:40 +0000 (00:33 +0000)
added support for default apt.conf

git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@484 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/scripts/vserver-build.functions.apt

index ce86246..30774e6 100644 (file)
@@ -42,7 +42,6 @@ function installBasePackages
 
 function initVariablesApt
 {
-    :
 }
 
 function initFilesystemApt
@@ -50,6 +49,14 @@ function initFilesystemApt
     mkdir -p "$PKGCFGDIR"/apt/{etc,archives/partial,cache,state/lists/partial}
     
     populateDirectory "$PKGCFGDIR/apt/etc" \
+       "$DISTRIBDIR/defaults/apt" \
        "$DISTRIBDIR/$DISTRIBUTION/apt" \
        "$CONFDIR/.distributions/$DISTRIBUTION/apt"
+
+    local f="$PKGCFGDIR"/apt/etc/apt.conf
+    if test -e "$f"; then
+       sed -e "s!@APTETCDIR@!$PKGCFGDIR/apt/etc!g" "$f" >"$f.tmp"
+       cmp -s "$f" "$f.tmp" || cat "$f.tmp" >"$f"
+       rm -f "$f.tmp"
+    fi
 }