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=037a5095ebe040a27fb0ecd92a593c7b458911a4;hp=dd54cae667b75ba99f0a10624f336b75e6acb571;hpb=e3e0c98fbdfc024566c0f5d45bcf5c4bd91e19f8;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.functions.apt b/util-vserver/scripts/vserver-build.functions.apt index dd54cae..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= @@ -43,18 +43,18 @@ 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" \ + "$__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" \ + "$__CONFDIR/.distributions/$DISTRIBUTION/vendor.conf" \ + "$__CONFDIR/.defaults/apps/pkgmgmt/vendor.conf" \ /etc/apt/vendors.list \ - "$DISTRIBDIR/$DISTRIBUTION/vendor.conf" \ - "$DISTRIBDIR/defaults/vendor.conf" \ + "$__DISTRIBDIR/$DISTRIBUTION/vendor.conf" \ + "$__DISTRIBDIR/defaults/vendor.conf" \ '' } @@ -63,9 +63,9 @@ function apt.initFilesystem 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