X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.functions.apt;h=dd54cae667b75ba99f0a10624f336b75e6acb571;hb=090a340dad3e79a3ccfa6954c779f5abf71f0f60;hp=30774e6af4de680fb9ac58a7b0da251d55c822b4;hpb=dfe1b38c6188bf170e9268de16713b956ad0d738;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.functions.apt b/util-vserver/scripts/vserver-build.functions.apt index 30774e6..dd54cae 100644 --- a/util-vserver/scripts/vserver-build.functions.apt +++ b/util-vserver/scripts/vserver-build.functions.apt @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -function installBasePackages +function apt.installBasePackages { local name="$1" local dir="$2" @@ -40,13 +40,27 @@ function installBasePackages done } -function initVariablesApt +function apt.initVariables { + findFile APTCONFDEFAULT \ + "$CONFDIR/.distributions/$DISTRIBUTION/apt.conf" \ + "$CONFDIR/.defaults/apps/pkgmgmt/apt.conf" \ + "$DISTRIBDIR/$DISTRIBUTION/apt.conf" \ + "$DISTRIBDIR/defaults/apt.conf" \ + '' + + findFile APTVENDORDEFAULT \ + "$CONFDIR/.distributions/$DISTRIBUTION/vendor.conf" \ + "$CONFDIR/.defaults/apps/pkgmgmt/vendor.conf" \ + /etc/apt/vendors.list \ + "$DISTRIBDIR/$DISTRIBUTION/vendor.conf" \ + "$DISTRIBDIR/defaults/vendor.conf" \ + '' } -function initFilesystemApt +function apt.initFilesystem { - mkdir -p "$PKGCFGDIR"/apt/{etc,archives/partial,cache,state/lists/partial} + mkdir -p "$PKGCFGDIR"/apt/{etc/sources.list.d,etc/vendors.list.d,etc/apt.conf.d,archives/partial,cache,state/lists/partial} populateDirectory "$PKGCFGDIR/apt/etc" \ "$DISTRIBDIR/defaults/apt" \ @@ -55,8 +69,14 @@ function initFilesystemApt 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" + $_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 + + test -z "$APTCONFDEFAULT" || \ + $_LN_S "$APTCONFDEFAULT" "$PKGCFGDIR"/apt/etc/apt.conf.d/default.conf + + test -z "$APTVENDORDEFAULT" || \ + $_LN_S "$APTVENDORDEFAULT" "$PKGCFGDIR"/apt/etc/vendors.list.d/default.conf }