X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.functions.apt;h=328a699a26d7bee1cf8cb74adc9cf73da83d2887;hb=202b41b95f79d6faddf79b2fc0f642031034da7c;hp=bd270d22edcd994e7ceb9e7b3338c07be92aeff0;hpb=16eafb4fda7a2946dbcc9ca52f4cf7f68383e873;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.functions.apt b/util-vserver/scripts/vserver-build.functions.apt index bd270d2..328a699 100644 --- a/util-vserver/scripts/vserver-build.functions.apt +++ b/util-vserver/scripts/vserver-build.functions.apt @@ -22,7 +22,7 @@ function apt.installBasePackages test "$dir" != / || return 0 for filelist in "$dir"/*; do - test -f "$filelist" || continue + isRegularFile "$filelist" || continue local idx=0 local can_fail=false local flags= @@ -42,22 +42,41 @@ function apt.installBasePackages 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 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" \ - "$DISTRIBDIR/$DISTRIBUTION/apt" \ - "$CONFDIR/.distributions/$DISTRIBUTION/apt" + "$__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" + $_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 }