SPECS: util-vserver.spec - merged init subpackage with main - add a pair of...
baggins
baggins at pld-linux.org
Sun Nov 23 23:33:00 CET 2008
Author: baggins Date: Sun Nov 23 22:33:00 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged init subpackage with main
- add a pair of nice triggers that won't allow preun from obsoleted
util-vserver-init to fuck up running vservers
---- Files affected:
SPECS:
util-vserver.spec (1.209 -> 1.210)
---- Diffs:
================================================================
Index: SPECS/util-vserver.spec
diff -u SPECS/util-vserver.spec:1.209 SPECS/util-vserver.spec:1.210
--- SPECS/util-vserver.spec:1.209 Sun Nov 23 23:22:44 2008
+++ SPECS/util-vserver.spec Sun Nov 23 23:32:55 2008
@@ -1,6 +1,5 @@
# $Revision$, $Date$
# TODO
-# - merge -init subpackage with main?
# - reject install in %%pretrans if /proc/virtual/info has incompatible version
# - make pkgmgmnt internalize modify poldek conf to unignore vserver-packages
#
@@ -20,7 +19,7 @@
Summary(pl.UTF-8): Narzędzia dla linuksowych serwerów wirtualnych
Name: util-vserver
Version: 0.30.215
-Release: 10.4
+Release: 10.5
License: GPL
Group: Applications/System
Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
@@ -93,6 +92,7 @@
%{?with_xalan:BuildRequires: xalan-j}
%endif
Requires(post,preun): /sbin/chkconfig
+Requires(triggerun,triggerpostun): /bin/chmod
Requires: %{name}-lib = %{version}-%{release}
Requires: diffutils
Requires: issue
@@ -105,6 +105,7 @@
Conflicts: poldek < 0.18.8-10
Obsoletes: util-vserver-build
Obsoletes: util-vserver-core
+Obsoletes: util-vserver-init
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%if %{with dietlibc}
@@ -128,9 +129,9 @@
set_ipv4root system call.
This package contains utilities which are required to communicate with
-the Linux-Vserver enabled kernel and utilities which assist in building
-Vservers.
-
+the Linux-Vserver enabled kernel, utilities which assist in building
+Vservers and SysV initscripts which start and stop Vservers and related
+tools.
%description -l pl.UTF-8
Ten pakiet dostarcza składniki i szkielet do tworzenia wirtualnych
@@ -143,8 +144,9 @@
new_s_context i set_ipv4root.
Ten pakiet zawiera narzędzia wymagane do komunikacji z jądrem z
-włączonym mechanizmem Linux-Vserver i narzędzia pomagające przy
-budowaniu Vserwerów.
+włączonym mechanizmem Linux-Vserver, narzędzia pomagające przy
+budowaniu Vserwerów i skrypty inicjalizujące SysV uruchamiające i
+zatrzymujące Vserwery oraz powiązane narzędzia.
%package lib
Summary: Dynamic libraries for util-vserver
@@ -197,36 +199,6 @@
%description static -l pl.UTF-8
Ten pakiet zawiera statyczną wersję biblioteki vservera.
-%package init
-Summary: initscripts for vserver
-Summary(pl.UTF-8): Skrypty inicjalizujące dla vserwera
-Group: Applications/System
-Requires(post,preun): /sbin/chkconfig
-Requires: %{name} = %{version}-%{release}
-Requires: diffutils
-Requires: make
-Requires: rc-scripts
-
-%description init
-util-vserver provides the components and a framework to setup virtual
-servers. A virtual server runs inside a linux server. It is
-nevertheless highly independent. As such, you can run various services
-with normal configuration. The various vservers can't interact with
-each other and can't interact with services in the main server.
-
-This package contains the SysV initscripts which start and stop
-Vservers and related tools.
-
-%description init -l pl.UTF-8
-util-vserver dostarcza składniki i szkielet do tworzenia wirtualnych
-serwerów. Wirtualny serwer działa wewnątrz serwera linuksowego, lecz
-jest od niego w dużym stopniu niezależny. Jako taki może uruchamiać
-różne usługi z normalną konfiguracją. Różne vserwery nie mogą wchodzić
-w interakcję z innymi ani z usługami na głównym serwerze.
-
-Ten pakiet zawiera skrypty inicjalizujące SysV uruchamiające i
-zatrzymujące Vserwery oraz powiązane narzędzia.
-
%package legacy
Summary: Legacy utilities for util-vserver
Summary(pl.UTF-8): Stare narzędzia dla util-vserver
@@ -566,26 +538,30 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%triggerun -- util-vserver-init
+# Prevent preun from util-vserver-init from working
+chmod a-x /etc/rc.d/init.d/vprocunhide
+chmod a-x /etc/rc.d/init.d/vrootdevices
+chmod a-x /etc/rc.d/init.d/vservers
+
+%triggerpostun -- util-vserver--init
+# Restore what preun from util-vserver-init removed
+chmod ug+x /etc/rc.d/init.d/vprocunhide
+chmod ug+x /etc/rc.d/init.d/vrootdevices
+chmod ug+x /etc/rc.d/init.d/vservers
+/sbin/chkconfig --add vrootdevices
+/sbin/chkconfig --add vprocunhide
+/sbin/chkconfig --add vservers
+
%post
%{_sbindir}/setattr --barrier /vservers || :
/sbin/chkconfig --add util-vserver
-if [ ! -f /var/lock/subsys/util-vserver ]; then
- echo "Type \"/sbin/service util-vserver start\" to set up vshelper path" 1>&2
-fi
-
-%preun
-if [ "$1" = "0" ]; then
- %service util-vserver stop
- /sbin/chkconfig --del util-vserver
-fi
-
-%post lib -p /sbin/ldconfig
-%postun lib -p /sbin/ldconfig
-
-%post init
/sbin/chkconfig --add vrootdevices
/sbin/chkconfig --add vprocunhide
/sbin/chkconfig --add vservers
+if [ ! -f /var/lock/subsys/util-vserver ]; then
+ echo "Type \"/sbin/service util-vserver start\" to set up vshelper path" 1>&2
+fi
if [ ! -f /var/lock/subsys/vrootdevices ]; then
echo "Type \"/sbin/service vrootdevices start\" to assign virtual root devices" 1>&2
fi
@@ -596,16 +572,21 @@
echo "Type \"/sbin/service vservers start\" to start vservers" 1>&2
fi
-%preun init
+%preun
if [ "$1" = "0" ]; then
+ %service util-vserver stop
%service vservers stop
%service vprocunhide stop
%service vrootdevices stop
+ /sbin/chkconfig --del util-vserver
/sbin/chkconfig --del vservers
/sbin/chkconfig --del vprocunhide
/sbin/chkconfig --del vrootdevices
fi
+%post lib -p /sbin/ldconfig
+%postun lib -p /sbin/ldconfig
+
%post legacy
/sbin/chkconfig --add rebootmgr
/sbin/chkconfig --add vservers-legacy
@@ -640,6 +621,13 @@
%doc AUTHORS ChangeLog NEWS THANKS doc/intro.txt
%doc contrib/yum*.patch package-management.txt
%{?with_doc:%doc doc/*.html}
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vrootdevices
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vservers
+%config(noreplace) %verify(not md5 mtime size) /etc/cron.d/vservers
+%attr(754,root,root) /etc/rc.d/init.d/vprocunhide
+%attr(754,root,root) /etc/rc.d/init.d/vrootdevices
+%attr(754,root,root) /etc/rc.d/init.d/util-vserver
+%attr(754,root,root) /etc/rc.d/init.d/vservers
%dir %{_sysconfdir}/vservers
%dir %{_sysconfdir}/vservers/.defaults
%dir %{_sysconfdir}/vservers/.defaults/apps
@@ -755,6 +743,7 @@
%attr(755,root,root) %{_libdir}/%{name}/vshelper
%attr(755,root,root) %{_libdir}/%{name}/vshelper-sync
%attr(755,root,root) %{_libdir}/%{name}/vsysctl
+%attr(755,root,root) %{_libdir}/%{name}/vsysvwrapper
%attr(755,root,root) %{_libdir}/%{name}/vunify
%attr(755,root,root) %{_libdir}/%{name}/vyum-worker
%{_mandir}/man8/chbind.8*
@@ -791,17 +780,6 @@
%defattr(644,root,root,755)
%{_libdir}/libvserver.a
-%files init
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/vsysvwrapper
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vrootdevices
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vservers
-%config(noreplace) %verify(not md5 mtime size) /etc/cron.d/vservers
-%attr(754,root,root) /etc/rc.d/init.d/vprocunhide
-%attr(754,root,root) /etc/rc.d/init.d/vrootdevices
-%attr(754,root,root) /etc/rc.d/init.d/util-vserver
-%attr(754,root,root) /etc/rc.d/init.d/vservers
-
%files legacy
%defattr(644,root,root,755)
%dir %{_sysconfdir}/vservices
@@ -911,6 +889,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.210 2008/11/23 22:32:55 baggins
+- merged init subpackage with main
+- add a pair of nice triggers that won't allow preun from obsoleted
+ util-vserver-init to fuck up running vservers
+
Revision 1.209 2008/11/23 22:22:44 baggins
- util-vserver init script in main package
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/util-vserver.spec?r1=1.209&r2=1.210&f=u
More information about the pld-cvs-commit
mailing list