X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver-pl.spec;h=5018273c4167fe06d0023637b58a5954988f455d;hb=3cf722964e6489a1f0615557ded3513bdf0b0e6b;hp=0ae6723cdd659328eee3a55538effa8b54cae5a9;hpb=bc664585973a06e712d1a6b4f2627f4fb973e340;p=util-vserver-pl.git

diff --git a/util-vserver-pl.spec b/util-vserver-pl.spec
index 0ae6723..5018273 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 18
+%define taglevel 26
 
 %define release	%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -74,39 +74,42 @@ if [ ! -f /etc/shells ] || ! grep -q '^/bin/vsh$' /etc/shells ; then
 	echo /bin/vsh >> /etc/shells
 fi
 
-/usr/sbin/bwlimit init
-
 # Migrate old style vservers to new style
 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 $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
 	
-        # 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
+	        # set cflags
+		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
+	
+	        # 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
 
@@ -123,7 +126,6 @@ rm -fr %{buildroot}
 
 %files -f %name-python.list
 %defattr(-,root,root,-)
-%{_sbindir}/bwlimit
 %{_sbindir}/disklimit
 %{_sbindir}/vuseradd
 %{_sbindir}/vuserdel
@@ -136,6 +138,31 @@ rm -fr %{buildroot}
 %{_mandir}/man8/vsh.8*
 
 %changelog
+* Tue Jun 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - util-vserver-pl-0.4-26
+- added support for loopback isolation
+
+* Wed Mar 23 2011 S.Çağlar Onur <caglar@verivue.com> - util-vserver-pl-0.4-25
+- vuserdel doesn't handle new vserver features that we are using like mount namespaces and/or cgroups, so it silently fails most of the time. Remove old code and start to use vserver provided tools
+
+* 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
+
+* Wed Dec 01 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - util-vserver-pl-0.4-21
+- force remove nonamespace
+
+* Tue Oct 12 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-pl-0.4-20
+- Fix the segfault caused by existing TUN device
+
+* Fri Aug 13 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-pl-0.4-19
+- Fix syntax error
+
 * Mon Aug 09 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - util-vserver-pl-0.4-18
 - migrate old style interface files to new style