[ircd-ratbox] Migrate to systemd.
Jon Ciesla
limb at fedoraproject.org
Wed Apr 18 13:40:14 UTC 2012
commit 6ea04dc7d2cf543a2ba06cbe3c217f20fa368884
Author: Jon Ciesla <limburgher at gmail.com>
Date: Wed Apr 18 08:39:18 2012 -0500
Migrate to systemd.
ircd-ratbox.spec | 48 ++++++++++++++++++++++++++++++++++++------------
ircd.service | 12 ++++++++++++
2 files changed, 48 insertions(+), 12 deletions(-)
---
diff --git a/ircd-ratbox.spec b/ircd-ratbox.spec
index e79d9eb..bbe8c95 100644
--- a/ircd-ratbox.spec
+++ b/ircd-ratbox.spec
@@ -2,7 +2,7 @@
Name: ircd-ratbox
Version: 2.2.8
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Ircd-ratbox is an advanced, stable and fast ircd
License: GPLv2
@@ -12,13 +12,13 @@ Conflicts: ircd-hybrid
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel, bison, flex
Requires(pre): shadow-utils
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(post): /sbin/chkconfig
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
URL: http://www.ircd-ratbox.org/
Source: http://www.ircd-ratbox.org/download/%{name}-%{version}.tgz
-Source1: ircd.init
+Source1: ircd.service
Source2: ircd.sysconfig
Source3: ircd.fedora.conf
Source4: ircd.logrotate
@@ -73,7 +73,7 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_datadir}/ircd $RPM_BUILD_ROOT%{_var}/log $RPM_BUILD_ROOT%{_sysconfdir}/ircd
make install DESTDIR=$RPM_BUILD_ROOT
-install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/ircd
+install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}/ircd.service
install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/ircd
install -D -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ircd/ircd.conf
install -D -m664 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ircd
@@ -92,17 +92,38 @@ useradd -r -g ircd -m -d %{_var}/run/ircd-ratbox -s /sbin/nologin \
-c "ircd-ratbox user" ircd
%post
-if [ $1 -eq 0 ]; then
- /sbin/chkconfig --add ircd
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
+
%preun
-if [ $1 -eq 0 ]; then
- /sbin/service ircd stop >/dev/null 2>&1
- /sbin/chkconfig --del ircd
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable ircd.service > /dev/null 2>&1 || :
+ /bin/systemctl stop ircd.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 ircd.service >/dev/null 2>&1 || :
fi
+%triggerun -- ircd-ratbox < 2.2.8-9
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply ircd
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save ircd >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del ircd >/dev/null 2>&1 || :
+/bin/systemctl try-restart ircd.service >/dev/null 2>&1 || :
+
%files
%defattr(-,root,root)
%doc ChangeLog CREDITS INSTALL LICENSE README RELNOTES SVN-Access doc/*
@@ -119,7 +140,7 @@ fi
%{_sysconfdir}/ircd/*.conf
%{_sysconfdir}/ircd/*.motd
%{_sysconfdir}/sysconfig/ircd
-%{_sysconfdir}/init.d/ircd
+%{_unitdir}/ircd.service
%doc %{_mandir}/man8/ircd*
%dir %attr(750,ircd,ircd) %{_var}/log/ircd
%config(noreplace) %{_sysconfdir}/logrotate.d/ircd
@@ -128,6 +149,9 @@ fi
%{_bindir}/ircd-mkpasswd
%changelog
+* Wed Apr 18 2012 Jon Ciesla <limburgher at gmail.com> - 2.2.8-9
+- Migrate to systemd, BZ 789704.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/ircd.service b/ircd.service
new file mode 100644
index 0000000..e8fd6c9
--- /dev/null
+++ b/ircd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Internet Relay Chat Program Server
+After=network.target
+
+[Service]
+User=ircd
+Type=forking
+PIDFile=/run/ircd.pid
+ExecStart=/usr/bin/ircd -pidfile /run/ircd.pid
+
+[Install]
+WantedBy=multi-user.target
More information about the scm-commits
mailing list