X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.functions.yum;h=1006687a74e120410237fd0a57fbfcfcfcd00844;hb=202b41b95f79d6faddf79b2fc0f642031034da7c;hp=67a253a050852f2101f06ba8c4a7582daa262290;hpb=bd0454a515b140c582ce860e1ca218f4569c3287;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.functions.yum b/util-vserver/scripts/vserver-build.functions.yum index 67a253a..1006687 100644 --- a/util-vserver/scripts/vserver-build.functions.yum +++ b/util-vserver/scripts/vserver-build.functions.yum @@ -22,7 +22,7 @@ function yum.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= @@ -57,6 +57,7 @@ function yum.__substituteConf $_SED -e "s!@YUMETCDIR@!$prefix$PKGCFGDIR/yum/etc!g; s!@YUMCACHEDIR@!$prefix$PKGCFGDIR/yum/cache!g; s!@YUMLOGDIR@!$prefix$PKGCFGDIR/yum!g; + s!@YUMLOCKDIR@!$prefix$PKGCFGDIR/yum!g; " "$f" >"$f.tmp" $_CMP -s "$f" "$f.tmp" || $_CAT "$f.tmp" >"$f" $_RM -f "$f.tmp"