X-Git-Url: http://git.onelab.eu/?p=util-vserver-pl.git;a=blobdiff_plain;f=util-vserver-pl.spec;h=f391f98bbedece91f93cdc3d77a89af31de3ac3f;hp=97a9722c1a2eb3878c9bc152d1f1f3cb4a5e11f4;hb=HEAD;hpb=f32150a8d8f040c1bad1fb98833bb6e0f45ea298

diff --git a/util-vserver-pl.spec b/util-vserver-pl.spec
index 97a9722..f391f98 100644
--- a/util-vserver-pl.spec
+++ b/util-vserver-pl.spec
@@ -1,11 +1,6 @@
-#
-# $Id$
-#
-%define url $URL$
-
 %define name	util-vserver-pl
 %define version 0.4
-%define taglevel 23
+%define taglevel 29
 
 %define release	%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -23,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 Requires: util-vserver util-vserver-core util-vserver-build util-vserver-sysv
 Provides: util-vserver-python = %{version}-%{release}
@@ -74,42 +69,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
-
-	# 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
+        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
+	
+		# deprecated
+		rm -f $i/flags
 	
-        # 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
+	        # 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
 
@@ -126,7 +121,6 @@ rm -fr %{buildroot}
 
 %files -f %name-python.list
 %defattr(-,root,root,-)
-%{_sbindir}/bwlimit
 %{_sbindir}/disklimit
 %{_sbindir}/vuseradd
 %{_sbindir}/vuserdel
@@ -139,6 +133,24 @@ rm -fr %{buildroot}
 %{_mandir}/man8/vsh.8*
 
 %changelog
+* Sat Mar 09 2013 Stephen Soltesz <soltesz@opentechinstitute.org> - util-vserver-pl-0.4-29
+
+* Tue Aug 28 2012 Andy Bavier <acb@cs.princeton.edu> - util-vserver-pl-0.4-28
+- Bugfix for IPv6, ported from 0.3 branch
+
+* Thu Jul 19 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - util-vserver-pl-0.4-27
+- bwlimit now ships with plnode-utils
+
+* 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