X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver-pl.spec;h=6e7005f2ad57ee69ddce588c3aefb661b7609829;hb=d686331ebdb6f4ac633a7445972c636a22507181;hp=0938661e2ca47ff7fa22b334271496e34ec42dc0;hpb=b1620aa89770368df9eb71f904302a5041655504;p=util-vserver-pl.git

diff --git a/util-vserver-pl.spec b/util-vserver-pl.spec
index 0938661..6e7005f 100644
--- a/util-vserver-pl.spec
+++ b/util-vserver-pl.spec
@@ -5,7 +5,7 @@
 
 %define name	util-vserver-pl
 %define version 0.4
-%define taglevel 22
+%define taglevel 24
 
 %define release	%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -80,33 +80,38 @@ fi
 pushd /etc/vservers
 for i in `ls /etc/vservers` 
 do 
-        # set nflags
-	echo "persistent,lback_allow" > $i/nflags 
-	/usr/sbin/nattribute --set --nid `cat $i/context` --flag lback_allow
-
-        # set cflags
-	echo -e "persistent\n~info_init" > $i/cflags
-	/usr/sbin/vattribute --set --xid `cat $i/context` --flag ~sched_hard
-
-        # remove 16mb tmp restrictions
-	sed -i -e '/tmpfs\tsize=16m/d' $i/fstab
-
-        # enable mount namespaces
-	rm -f $i/nonamespace
+        if grep -rq "^0\.0\.0\.0" "$i/interfaces/"; then
+	        # set nflags
+		echo "persistent,lback_allow" > $i/nflags 
+		/usr/sbin/nattribute --set --nid `cat $i/context` --flag lback_allow
+	
+	        # set cflags
+		echo -e "persistent\n~info_init" > $i/cflags
+		/usr/sbin/vattribute --set --xid `cat $i/context` --flag ~sched_hard
 	
-        # enable IP forwarding
-	mkdir -p $i/sysctl/0 
-	echo net.ipv4.ip_forward > $i/sysctl/0/setting
-	echo 1 > $i/sysctl/0/value
-
-        # create missing interface files/directories
-        mkdir -p $i/interfaces/0 
-        hostname -i > $i/interfaces/0/ip
-        touch $i/interfaces/0/nodev 
-
-        mkdir -p $i/interfaces/1
-        echo -e "127.0.0.1" > $i/interfaces/1/ip
-        touch $i/interfaces/1/nodev
+		# deprecated
+		rm -f $i/flags
+	
+	        # remove 16mb tmp restrictions
+		sed -i -e '/tmpfs\tsize=16m/d' $i/fstab
+	
+	        # enable mount namespaces
+		rm -f $i/nonamespace
+		
+	        # enable IP forwarding
+		mkdir -p $i/sysctl/0 
+		echo net.ipv4.ip_forward > $i/sysctl/0/setting
+		echo 1 > $i/sysctl/0/value
+
+	        # create missing interface files/directories
+        	mkdir -p $i/interfaces/0 
+		hostname -i > $i/interfaces/0/ip
+		touch $i/interfaces/0/nodev 
+
+        	mkdir -p $i/interfaces/1
+        	echo -e "127.0.0.1" > $i/interfaces/1/ip
+        	touch $i/interfaces/1/nodev
+	fi
 done
 popd
 
@@ -136,6 +141,13 @@ rm -fr %{buildroot}
 %{_mandir}/man8/vsh.8*
 
 %changelog
+* Thu Mar 10 2011 S.Çağlar Onur <caglar@verivue.com> - util-vserver-pl-0.4-24
+- * associate SSH processes with the appropriate cgroup
+- *  migrate only when neccessary
+
+* Wed Mar 02 2011 S.Çağlar Onur <caglar@verivue.com> - util-vserver-pl-0.4-23
+- remove hardcoded nproc.hard limit as it shouldn't be hardcoded
+
 * Wed Feb 02 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - util-vserver-pl-0.4-22
 - pass device to bwlimit