[cobbler/f16] use systemd in f16+
Tom Callaway
spot at fedoraproject.org
Fri Sep 9 19:59:27 UTC 2011
commit 0f30a17be23e2e06235bbf6da63829d934a4d9e4
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Fri Sep 9 15:59:15 2011 -0400
use systemd in f16+
cobbler.spec | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
cobblerd.service | 12 +++++++
2 files changed, 99 insertions(+), 3 deletions(-)
---
diff --git a/cobbler.spec b/cobbler.spec
index 4c8c5fe..acbbc5c 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -7,8 +7,9 @@ Name: cobbler
License: GPLv2+
AutoReq: no
Version: 2.0.11
-Release: 2%{?dist}
+Release: 3%{?dist}
Source0: cobbler-%{version}.tar.gz
+Source1: cobblerd.service
Group: Applications/System
Requires: python >= 2.3
%if 0%{?suse_version} >= 1000
@@ -54,11 +55,18 @@ Requires: rsync
%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
Requires: yum-utils
%endif
-
+%if 0%{?fedora} >= 16
+BuildRequires: systemd-units
+Requires(post): systemd-sysv
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+%else
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
-
Requires(preun): /sbin/service
+%endif
+
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
Requires: python(abi) >= %{pyver}
@@ -97,6 +105,74 @@ PREFIX="--prefix=/usr"
%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
mkdir $RPM_BUILD_ROOT/var/www/cobbler/rendered/
+%if 0%{?fedora} >= 16
+rm -rf $RPM_BUILD_ROOT/etc/init.d
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}
+
+%post
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+elif [ "$1" -ge "2" ]; then
+ # backup config
+ if [ -e /var/lib/cobbler/distros ]; then
+ cp /var/lib/cobbler/distros* /var/lib/cobbler/backup 2>/dev/null
+ cp /var/lib/cobbler/profiles* /var/lib/cobbler/backup 2>/dev/null
+ cp /var/lib/cobbler/systems* /var/lib/cobbler/backup 2>/dev/null
+ cp /var/lib/cobbler/repos* /var/lib/cobbler/backup 2>/dev/null
+ cp /var/lib/cobbler/networks* /var/lib/cobbler/backup 2>/dev/null
+ fi
+ if [ -e /var/lib/cobbler/config ]; then
+ cp -a /var/lib/cobbler/config /var/lib/cobbler/backup 2>/dev/null
+ fi
+ # upgrade older installs
+ # move power and pxe-templates from /etc/cobbler, backup new templates to *.rpmnew
+ for n in power pxe; do
+ rm -f /etc/cobbler/$n*.rpmnew
+ find /etc/cobbler -maxdepth 1 -name "$n*" -type f | while read f; do
+ newf=/etc/cobbler/$n/`basename $f`
+ [ -e $newf ] && mv $newf $newf.rpmnew
+ mv $f $newf
+ done
+ done
+ # upgrade older installs
+ # copy kickstarts from /etc/cobbler to /var/lib/cobbler/kickstarts
+ rm -f /etc/cobbler/*.ks.rpmnew
+ find /etc/cobbler -maxdepth 1 -name "*.ks" -type f | while read f; do
+ newf=/var/lib/cobbler/kickstarts/`basename $f`
+ [ -e $newf ] && mv $newf $newf.rpmnew
+ cp $f $newf
+ done
+ /bin/systemctl try-restart cobblerd.service >/dev/null 2>&1 || :
+fi
+
+%preun
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable cobblerd.service > /dev/null 2>&1 || :
+ /bin/systemctl stop cobblerd.service > /dev/null 2>&1 || :
+fi
+
+%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart cobblerd.service >/dev/null 2>&1 || :
+fi
+
+%triggerun -- cobbler < 2.0.11-3
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply cobblerd
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save cobblerd >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del cobblerd >/dev/null 2>&1 || :
+/bin/systemctl try-restart cobblerd.service >/dev/null 2>&1 || :
+
+%else
+
%post
if [ "$1" = "1" ];
then
@@ -151,6 +227,7 @@ if [ "$1" -ge "1" ]; then
/sbin/service httpd condrestart >/dev/null 2>&1 || :
fi
+%endif
%clean
test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
@@ -226,7 +303,11 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%exclude %{python_sitelib}/cobbler/sub_process.py*
%endif
%{_mandir}/man1/cobbler.1.gz
+%if 0%{?fedora} >= 16
+%{_unitdir}/cobblerd.service
+%else
/etc/init.d/cobblerd
+%endif
%if 0%{?suse_version} >= 1000
%config(noreplace) /etc/apache2/conf.d/cobbler.conf
@@ -399,6 +480,9 @@ Web interface for Cobbler that allows visiting http://server/cobbler_web to conf
%doc AUTHORS COPYING CHANGELOG README
%changelog
+* Fri Sep 9 2011 Tom Callaway <spot at fedoraproject.org> - 2.0.11-3
+- convert to systemd (f16+)
+
* Tue Apr 26 2011 Scott Henson <shenson at redhat.com> - 2.0.11-2
- Actually include a change log entry
diff --git a/cobblerd.service b/cobblerd.service
new file mode 100644
index 0000000..e1e1a95
--- /dev/null
+++ b/cobblerd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Cobbler Helper Daemon
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/cobblerd
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
+
More information about the scm-commits
mailing list