X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec;h=7e8fd6851d3c6dd45fb245ccf67fa68fdb23fc88;hb=780710c3d80b8776944dd1fc65a0fda64f399db0;hp=881c6ec8a8c15d924fb01fe9213fd494d813c683;hpb=8cf13bb177d92c93eb73dc8939777150536c2d00;p=util-vserver.git diff --git a/util-vserver.spec b/util-vserver.spec index 881c6ec..7e8fd68 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -15,13 +15,25 @@ %{!?release_func:%global release_func() %1%{?dist}} +%define name util-vserver +%define version 0.30.208 +%define release 2.planetlab%{?date:.%{date}} + +%define _without_dietlibc 1 +%define _without_xalan 1 + +Vendor: PlanetLab +Packager: PlanetLab Central +Distribution: PlanetLab 3.0 +URL: http://cvs.planet-lab.org/cvs/util-vserver + Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.208 -Release: %release_func 0 +Release: %{release} License: GPL Group: System Environment/Base -URL: http://savannah.nongnu.org/projects/util-vserver/ +#URL: http://savannah.nongnu.org/projects/util-vserver/ Source0: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2 BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) @@ -34,7 +46,6 @@ BuildRequires: mount vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel beecrypt-devel BuildRequires: doxygen tetex-latex -Requires(post): %__chattr Requires(pre): %pkglibdir Requires(postun): %pkglibdir %{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.25} @@ -88,6 +99,12 @@ Group: Development/Libraries Requires: pkgconfig Requires: %name-lib = %version-%release +%package python +Summary: Python modules for manipulating vservers +Group: Applications/System +Requires: python util-python +Obsoletes: util-vserver-py23 + %description util-vserver provides the components and a framework to setup virtual @@ -162,9 +179,18 @@ This package contains header files and libraries which are needed to develop VServer related applications. +%description python +Python modules for manipulating vservers. Provides a superset of the +functionality of the vserver script (at least will do in the future), +but more readily accessible from Python code. + + %prep %setup -q +aclocal -I m4 +autoconf +automake --add-missing %build %configure --with-initrddir=%_initrddir --enable-release \ @@ -173,6 +199,7 @@ develop VServer related applications. %__make %{?_smp_mflags} all %__make %{?_smp_mflags} doc +%__make -C python %install rm -rf $RPM_BUILD_ROOT @@ -184,9 +211,12 @@ MANIFEST_CONFIG='%config' \ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat +# install python bindings +%__make -C python DESTDIR="$RPM_BUILD_ROOT" install + %check || : -%__make check +#%__make check %clean @@ -202,26 +232,40 @@ f="%confdefaultdir/run.rev"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/r %_sbindir/setattr --barrier /vservers || : +# add /bin/vsh to list of secure shells +if [ ! -f /etc/shells ] || ! grep -q '^/bin/vsh$' /etc/shells ; then + echo /bin/vsh >> /etc/shells +fi + + +%postun +# 0 = erase, 1 = upgrade +if [ "$1" = 0 ] ; then + perl -i -n -e 'next if /^\/bin\/vsh$/; print' /etc/shells +fi + %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig %post sysv -%chkconfig --add vservers-default -%chkconfig --add vprocunhide - - +#%chkconfig --add vservers-default +#%chkconfig --add vprocunhide +# PlanetLab Node Manager takes care of starting and stopping VServers +%chkconfig --del vservers-default +# PlanetLab does not require /proc security +%chkconfig --del vprocunhide %preun sysv -test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || : +#test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || : -test "$1" != 0 || %chkconfig --del vprocunhide -test "$1" != 0 || %chkconfig --del vservers-default +#test "$1" != 0 || %chkconfig --del vprocunhide +#test "$1" != 0 || %chkconfig --del vservers-default %postun sysv -test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || : +#test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || : %triggerin build -- fedora-release @@ -257,26 +301,28 @@ done %post legacy -%chkconfig --add rebootmgr -%chkconfig --add vservers-legacy +# PlanetLab Node Manager takes care of starting and stopping VServers +#%chkconfig --add rebootmgr +#%chkconfig --add vservers-legacy -for i in %v_services; do - %chkconfig --add v_$i -done +# PlanetLab does not require these legacy services +#for i in %v_services; do +# %chkconfig --add v_$i +#done %preun legacy -test "$1" != 0 || %_initrddir/rebootmgr stop &>/dev/null || : +#test "$1" != 0 || %_initrddir/rebootmgr stop &>/dev/null || : -test "$1" != 0 || for i in %v_services; do - %chkconfig --del v_$i -done +#test "$1" != 0 || for i in %v_services; do +# %chkconfig --del v_$i +#done -test "$1" != 0 || %chkconfig --del rebootmgr -test "$1" != 0 || %chkconfig --del vservers-legacy +#test "$1" != 0 || %chkconfig --del rebootmgr +#test "$1" != 0 || %chkconfig --del vservers-legacy %postun legacy -test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : +#test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %files -f %name-base.list @@ -329,15 +375,55 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %doc lib/apidoc/html +%files python +%defattr(0644,root,root) +%_libdir/python2.3/site-packages/* + + %changelog +* Fri Oct 7 2005 Steve Muir +- create common function to be used for entering a vserver and applying + resource limits + +* Thu Aug 21 2005 Mark Huang +- restore build of python modules + +* Sat Aug 20 2005 Mark Huang +- upgrade to util-vserver-0.30.208 +- forward-port vbuild and legacy support until we can find a suitable + replacement +- make vsh use new vc_create_context() call + +* Thu Jul 28 2005 Steve Muir +- add support for static vserver IDs to vuseradd and vuserdel + +* Thu Jul 21 2005 Steve Muir +- add bwlimit and cpulimit modules + * Fri Jul 15 2005 Enrico Scholz - 0:0.30.208-1 - require the -lib subpackage by -devel - copy GPG keys from /etc/pki/rpm-gpg/ +* Mon Jun 20 2005 Steve Muir +- import Marc's vdu implementation + +* Wed Jun 15 2005 Steve Muir +- 'vserver-init start' functionality subsumed by Node Manager + +* Thu Jun 02 2005 Marc E. Fiuczynski +- Fixed vlimit command + +* Wed May 25 2005 Steve Muir +- add Python modules for manipulating vservers + * Fri Apr 15 2005 Enrico Scholz - 0:0.30.206-1 - added patches to make yum work in chroot environments - version 0.30.206 +* Thu Apr 7 2005 Steve Muir +- vuserdel changes: don't shutdown vserver, just kill all processes; + unmount all mountpoints in vserver before deleting + * Thu Mar 24 2005 Enrico Scholz - 0:0.30.205-0 - added some %%descriptions - copy GPG keys from the system into the confdir @@ -354,9 +440,42 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : - do not ship the /vservers directory itself; as it is immutable, the extraction will fail else +* Fri Nov 19 2004 Mark Huang +- vcached no longer runs as a daemon +- do not restart vservers when package is upgraded + +* Wed Nov 17 2004 Mark Huang 0.30-6.planetlab ++ planetlab-3_0-rc4 +- PL2445 +- Both vcached and vuseradd now print a warning message when vbuild + succeeds but the resulting new vserver image is smaller in size than + the vserver-reference image. +- vuseradd: clean up some more junk on failure + +* Tue Nov 16 2004 Mark Huang 0.30-5.planetlab ++ planetlab-3_0-rc3 +- PL3026: This is the upgraded version of vdu that maintains an + internal hash table of files with a nlink count > 1. Only if vdu + sees all hard links to a particular inode does it add its size and + block count to the total. + +* Fri Nov 12 2004 Mark Huang 0.30-4.planetlab +- PL2445 Use -b option to du to avoid rounding errors. + +* Sat Nov 6 2004 Mark Huang 0.30-3.planetlab ++ planetlab-3_0-rc2 +- don't create the symbolic link /home/slice/.ssh, this is not how + pl_sshd works + +* Mon Oct 11 2004 Marc E. Fiuczynski +- added vsh + * Thu Sep 9 2004 Enrico Scholz - 0:0.30.194-0 - documented switches for 'rpmbuild' +* Wed Aug 11 2004 Mark Huang 0.29-1.planetlab +- initial PlanetLab 3.0 build. + * Wed May 26 2004 Enrico Scholz - 0:0.29.215-0 - (re)added the MANIFEST_* variables which were lost some time ago; this will preserve %%config files...