From: Enrico Scholz Date: Fri, 5 Mar 2004 19:51:15 +0000 (+0000) Subject: try to read limits from dir only, when '--dir' was used X-Git-Tag: VERSION_0_10~460 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e23eee8b256a13f16396dead5b93a4e3a10f23af;p=util-vserver.git try to read limits from dir only, when '--dir' was used git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1113 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/src/vlimit.c b/util-vserver/src/vlimit.c index 3aba2b7..3c99493 100644 --- a/util-vserver/src/vlimit.c +++ b/util-vserver/src/vlimit.c @@ -391,7 +391,9 @@ int main (int argc, char *argv[]) if (ctx==VC_NOCTX) ctx = Evc_get_task_xid(0); - readFromDir(limits, &lim_mask, dir, missing_ok); + if (dir) + readFromDir(limits, &lim_mask, dir, missing_ok); + setLimits(ctx, limits, lim_mask); if (show_all) showAll(ctx);