X-Git-Url: http://git.onelab.eu/?p=util-vserver-pl.git;a=blobdiff_plain;f=src%2Fplanetlab.c;h=90ba4dd278cd912463cce36e7b18837fbd2b61e9;hp=92042fb0b91c88185755c10738375f3d873c3a4a;hb=a4750b971298b0b51f8db259b7f8f5976ee461d5;hpb=994f1ce788c942848aa66de783adb0ae736f154f

diff --git a/src/planetlab.c b/src/planetlab.c
index 92042fb..90ba4dd 100644
--- a/src/planetlab.c
+++ b/src/planetlab.c
@@ -300,6 +300,10 @@ pl_get_limits(const char *context, struct sliver_resources *slr)
     {"rlimits/openfd.soft", TYPE_LONG, &slr->vs_openfd.soft},
     {"rlimits/openfd.min", TYPE_LONG, &slr->vs_openfd.min},
 
+    {"rlimits/memlock.hard", TYPE_LONG, &slr->vs_memlock.hard},
+    {"rlimits/memlock.soft", TYPE_LONG, &slr->vs_memlock.soft},
+    {"rlimits/memlock.min", TYPE_LONG, &slr->vs_memlock.min},
+
     {"personality", TYPE_PERS, &slr->personality},
 
     {0,0}
@@ -323,6 +327,10 @@ pl_get_limits(const char *context, struct sliver_resources *slr)
   slr->vs_openfd.soft = VC_LIM_KEEP;
   slr->vs_openfd.min = VC_LIM_KEEP;
 
+  slr->vs_memlock.hard = VC_LIM_KEEP;
+  slr->vs_memlock.soft = VC_LIM_KEEP;
+  slr->vs_memlock.min = VC_LIM_KEEP;
+
   slr->personality = 0;
 
   cwd = open(".", O_RDONLY);
@@ -438,5 +446,6 @@ pl_set_ulimits(const struct sliver_resources *slr)
   set_one_ulimit(RLIMIT_AS, &slr->vs_as);
   set_one_ulimit(RLIMIT_NPROC, &slr->vs_nproc);
   set_one_ulimit(RLIMIT_NOFILE, &slr->vs_openfd);
+  set_one_ulimit(RLIMIT_MEMLOCK, &slr->vs_memlock);
   return set_personality(slr->personality);
 }