From: S.Çağlar Onur <caglar@verivue.com>
Date: Wed, 2 Mar 2011 21:07:49 +0000 (-0500)
Subject: remove hardcoded nproc.hard limit as it should be setted via GUI, also remove depreca... 
X-Git-Tag: util-vserver-pl-0.4-23~1
X-Git-Url: http://git.onelab.eu/?p=util-vserver-pl.git;a=commitdiff_plain;h=5cc3f93e60d51349c57fc2b0473e523b4e456c06

remove hardcoded nproc.hard limit as it should be setted via GUI, also remove deprecated flags file
---

diff --git a/scripts/vuseradd b/scripts/vuseradd
index 2c25cad..c49fdd4 100755
--- a/scripts/vuseradd
+++ b/scripts/vuseradd
@@ -89,7 +89,6 @@ if [ ! -d $__CONFDIR/$NAME ] ; then
     fi
     mkdir -p $DIR/apps/init $DIR/rlimits $DIR/sched $DIR/cgroup $DIR/dlimits/0 $DIR/sysctl/0
     echo default > $DIR/apps/init/mark
-    echo 1000 > $DIR/rlimits/nproc.hard
 
     # Set persistent for the network context
     echo persistent,lback_allow > $DIR/nflags
diff --git a/util-vserver-pl.spec b/util-vserver-pl.spec
index 0938661..22fb97a 100644
--- a/util-vserver-pl.spec
+++ b/util-vserver-pl.spec
@@ -88,6 +88,9 @@ do
 	echo -e "persistent\n~info_init" > $i/cflags
 	/usr/sbin/vattribute --set --xid `cat $i/context` --flag ~sched_hard
 
+	# deprecated
+	rm -f $i/flags
+
         # remove 16mb tmp restrictions
 	sed -i -e '/tmpfs\tsize=16m/d' $i/fstab