X-Git-Url: http://git.onelab.eu/?p=util-vserver-pl.git;a=blobdiff_plain;f=util-vserver-pl.spec;h=f391f98bbedece91f93cdc3d77a89af31de3ac3f;hp=d886a8759fb16a17326211f401ad61f8b9815265;hb=HEAD;hpb=c18fff6a3455fd76fe4c330790282d42a82884ed diff --git a/util-vserver-pl.spec b/util-vserver-pl.spec index d886a87..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 7 +%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 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,11 +69,43 @@ 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 echo "persistent,lback_allow" > $i/nflags; mkdir -p $i/sysctl/0; echo net.ipv4.ip_forward > $i/sysctl/0/setting; echo 1 > $i/sysctl/0/value; echo -e "persistent\n~info_init" > $i/cflags; done +for i in `ls /etc/vservers` +do + 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 + + # 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 %postun @@ -94,7 +121,6 @@ rm -fr %{buildroot} %files -f %name-python.list %defattr(-,root,root,-) -%{_sbindir}/bwlimit %{_sbindir}/disklimit %{_sbindir}/vuseradd %{_sbindir}/vuserdel @@ -107,6 +133,74 @@ rm -fr %{buildroot} %{_mandir}/man8/vsh.8* %changelog +* Sat Mar 09 2013 Stephen Soltesz - util-vserver-pl-0.4-29 + +* Tue Aug 28 2012 Andy Bavier - util-vserver-pl-0.4-28 +- Bugfix for IPv6, ported from 0.3 branch + +* Thu Jul 19 2012 Thierry Parmentelat - util-vserver-pl-0.4-27 +- bwlimit now ships with plnode-utils + +* Tue Jun 07 2011 Thierry Parmentelat - util-vserver-pl-0.4-26 +- added support for loopback isolation + +* Wed Mar 23 2011 S.Çağlar Onur - 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 - 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 - util-vserver-pl-0.4-23 +- remove hardcoded nproc.hard limit as it shouldn't be hardcoded + +* Wed Feb 02 2011 Thierry Parmentelat - util-vserver-pl-0.4-22 +- pass device to bwlimit + +* Wed Dec 01 2010 Thierry Parmentelat - util-vserver-pl-0.4-21 +- force remove nonamespace + +* Tue Oct 12 2010 S.Çağlar Onur - util-vserver-pl-0.4-20 +- Fix the segfault caused by existing TUN device + +* Fri Aug 13 2010 S.Çağlar Onur - util-vserver-pl-0.4-19 +- Fix syntax error + +* Mon Aug 09 2010 S.Çağlar Onur - util-vserver-pl-0.4-18 +- migrate old style interface files to new style + +* Wed Jul 28 2010 S.Çağlar Onur - util-vserver-pl-0.4-17 +- Some dead code removed from repository + +* Mon Jul 19 2010 S.Çağlar Onur - util-vserver-pl-0.4-16 +- * use system-wide umask +- * enable set_ipaddresses_config function +- * set more default values + +* Mon Jul 12 2010 Thierry Parmentelat - util-vserver-pl-0.4-15 +- new constant VC_LIM_INFINITY + +* Tue Jul 06 2010 S.Çağlar Onur - util-vserver-pl-0.4-14 +- fix setting cpu_share for slices + +* Thu Jun 24 2010 S.Çağlar Onur - util-vserver-pl-0.4-13 +- start to use mount namespaces + +* Tue Jun 22 2010 Thierry Parmentelat - util-vserver-pl-0.4-12 +- initscripts are ignored - handled by nodemanager and triggered by rc + +* Thu Jun 17 2010 Baris Metin - util-vserver-pl-0.4-11 +- sliver name as the last argument to initscript + +* Tue Jun 01 2010 S.Çağlar Onur - util-vserver-pl-0.4-10 +- remove tmpfs mounted /tmp + +* Fri May 14 2010 S.Çağlar Onur - util-vserver-pl-0.4-9 +- change flags without restarting the vservers + +* Thu May 13 2010 S.Çağlar Onur - util-vserver-pl-0.4-8 +- Migrate old style vservers to new style + * Thu May 13 2010 Talip Baris Metin - util-vserver-pl-0.4-7 - chroot_call fix