X-Git-Url: http://git.onelab.eu/?p=util-vserver-pl.git;a=blobdiff_plain;f=util-vserver-pl.spec;h=897016a19c82cff5047b83a901d9acaffce7e3d4;hp=59ed82985277c9a6220dfa632f18e60040c27f59;hb=c3c5ad082213c2530b1f0c67d1fc5341a67b8e27;hpb=6741c84c6fc55aa004f06df477670bd333de59da diff --git a/util-vserver-pl.spec b/util-vserver-pl.spec index 59ed829..897016a 100644 --- a/util-vserver-pl.spec +++ b/util-vserver-pl.spec @@ -4,8 +4,8 @@ %define url $URL$ %define name util-vserver-pl -%define version 0.3 -%define taglevel 11 +%define version 0.4 +%define taglevel 15 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -28,6 +28,8 @@ URL: %(echo %{url} | cut -d ' ' -f 2) Requires: util-vserver util-vserver-core util-vserver-build util-vserver-sysv Provides: util-vserver-python = %{version}-%{release} Obsoletes: util-vserver-py32 resman +BuildRequires: libnl libnl-devel +BuildRequires: python python-devel BuildRequires: util-vserver-core util-vserver-devel BuildRequires: autoconf automake libtool @@ -72,6 +74,26 @@ 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 + /usr/sbin/nattribute --set --nid `cat $i/context` --flag lback_allow + + sed -i -e '/tmpfs\tsize=16m/d' $i/fstab + rm $i/nonamespace + + 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 + /usr/sbin/vattribute --set --xid `cat $i/context` --flag ~sched_hard +done +popd %postun # 0 = erase, 1 = upgrade @@ -91,15 +113,103 @@ rm -fr %{buildroot} %{_sbindir}/vuseradd %{_sbindir}/vuserdel %{python_sitearch}/vserverimpl.so +%{_sbindir}/vip6-autod +%{_sysconfdir}/init.d/vip6-autod %attr(4755,root,root) %{_sbindir}/vsh /bin/vsh %{_mandir}/man8/vsh.8* -%{_sbindir}/vip6-autod -%{_sysconfdir}/init.d/vip6-autod - %changelog +* 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 + +* Wed May 12 2010 Talip Baris Metin - util-vserver-pl-0.4-6 +- fix initscript issues + +* Mon May 10 2010 S.Çağlar Onur - util-vserver-pl-0.4-5 + +* Mon May 10 2010 Talip Baris Metin - util-vserver-pl-0.4-4 +- merged trellis branch to trunk + +* Wed Feb 24 2010 Marc Fiuczynski - util-vserver-pl-0.3-27 +- Need to print the exception string as part of the self.log, or else we +- get a wrong number of argument error. + +* Wed Feb 24 2010 Daniel Hokka Zakrisson - util-vserver-pl-0.3-26 +- This is outputted for some reason. + +* Tue Feb 23 2010 Daniel Hokka Zakrisson - util-vserver-pl-0.3-25 +- Don't set bwlimits if they're disabled. +- Don't cleanup /var of running slivers. + +* Tue Feb 23 2010 Marc Fiuczynski - util-vserver-pl-0.3-24 +- - openfd -> nofile + +* Tue Feb 16 2010 Talip Baris Metin - util-vserver-pl-0.3-23 +- call bwlimit init in postinstall. + +* Fri Jan 29 2010 S.Çağlar Onur - util-vserver-pl-0.3-22 +- move the HTB tree one level down for DRL + +* Mon Jan 25 2010 Thierry Parmentelat - util-vserver-pl-0.3-21 +- logging policy only; use /var/log/nm instead of boot.log, and give more details with (un)setdlimit + +* Thu Nov 19 2009 Daniel Hokka Zakrisson - util-vserver-pl-0.3-20 +- Log the error as well. + +* Wed Oct 28 2009 Daniel Hokka Zakrisson - util-vserver-pl-0.3-19 +- Set ulimits for NM too. + +* Tue Oct 20 2009 Baris Metin - util-vserver-pl-0.3-18 +- bwlimit.set() now accepts the device and don't assume that it's eth0 + +* Tue Aug 04 2009 Faiyaz Ahmed - util-vserver-pl-0.3-17 +- Fix runlevel clean up after reboot. +- Fix runlevel setup to reflect proper runlevel. + +* Thu Jan 29 2009 Faiyaz Ahmed - util-vserver-pl-0.3-16 +- supports disabling htbs. + +* Wed Oct 29 2008 Marc E. Fiuczynski - util-vserver-pl-0.3-15 +- added in support for rlimit MEM_LOCK +- fixed bug in reading -1 value from VSERVERCONF//rlimits/memlock.hard file +- reduced compilation warnings + +* Tue Sep 23 2008 Thierry Parmentelat - util-vserver-pl-0.3-14 +- configure/make check the version of libnl and can cope with either 1.1 or 1.0-pre6 +- as centos does not have any of these, do build vip6-autod on fedora only + +* Wed Sep 17 2008 Faiyaz Ahmed - util-vserver-pl-0.3-13 +- Remove current bw limit checks before issuing tc. + +* Fri Aug 29 2008 Daniel Hokka Zakrisson - util-vserver-pl-0.3-12 +- libnl 1.1 fixups. + * Thu Aug 28 2008 Thierry Parmentelat - util-vserver-pl-0.3-11 - reads /etc/vservers//personality and behaves accordingly - nicer formatting for byte rates @@ -142,3 +252,5 @@ rm -fr %{buildroot} * Fri Nov 30 2007 Daniel Hokka Zakrisson - 0.1-1 - Initial release + +%define module_current_branch 0.3