ppisar pushed to perl-mogilefs-server (master). "Migrate from System V init scripts to systemd"

Thu Oct 29 14:05:34 UTC 2015

From 08742dfa7ef6dfad7344f5ef30cbbed56ae14245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Thu, 29 Oct 2015 13:04:34 +0100
Subject: Migrate from System V init scripts to systemd

---
 mogilefsd.init            | 62 ----------------------------------------------
 mogilefsd.service         | 11 +++++++++
 mogstored.init            | 62 ----------------------------------------------
 mogstored.service         | 11 +++++++++
 perl-mogilefs-server.spec | 63 ++++++++++++++++++++---------------------------
 5 files changed, 49 insertions(+), 160 deletions(-)
 delete mode 100644 mogilefsd.init
 create mode 100644 mogilefsd.service
 delete mode 100644 mogstored.init
 create mode 100644 mogstored.service

diff --git a/mogilefsd.init b/mogilefsd.init
deleted file mode 100644
index 07c0de7..0000000
--- a/mogilefsd.init
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-#
-# mogilefsd  This shell script controls the MogileFS tracker daemon
-#
-# Author:       Ruben Kerkhof <ruben at rubenkerkhof.com>
-#
-# chkconfig:    - 97 03
-#
-# description:  MogileFS is a distributed storage system
-# processname:  mogilefsd
-# config: /etc/mogilefs/mogilefsd.conf
-#
-
-# source function library
-. /etc/rc.d/init.d/functions
-
-RETVAL=0
-
-start() {
-	echo -n $"Starting MogileFS tracker daemon: "
-	daemon --user mogilefsd /usr/bin/mogilefsd --daemon
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mogilefsd
-}
-
-stop() {
-	echo -n $"Stopping MogileFS tracker daemon: "
-	killproc mogilefsd
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/mogilefsd
-}
-
-restart() {
-	stop
-	start
-}
-
-case "$1" in
-  start)
-	start
-	;;
-  stop) 
-	stop
-	;;
-  restart|force-reload|reload)
-	restart
-	;;
-  condrestart)
-	[ -f /var/lock/subsys/mogilefsd ] && restart
-	;;
-  status)
-	status mogilefsd
-	RETVAL=$?
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
-	exit 1
-esac
-
-exit $RETVAL
-
diff --git a/mogilefsd.service b/mogilefsd.service
new file mode 100644
index 0000000..5103c97
--- /dev/null
+++ b/mogilefsd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=MogileFS tracker daemon
+Documentation=man:mogilefsd(1)
+
+[Service]
+Type=simple
+User=mogilefsd
+ExecStart=/usr/bin/mogilefsd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/mogstored.init b/mogstored.init
deleted file mode 100644
index d751620..0000000
--- a/mogstored.init
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-# mogstored  This shell script controls the MogileFS storage daemon
-#
-# Author:       Ruben Kerkhof <ruben at rubenkerkhof.com>
-#
-# chkconfig:    - 97 03
-#
-# description:  MogileFS is a distributed storage system
-# processname:  mogstored
-# config: /etc/mogilefs/mogstored.conf
-#
-
-# source function library
-. /etc/rc.d/init.d/functions
-
-RETVAL=0
-
-start() {
-	echo -n $"Starting MogileFS tracker daemon: "
-	daemon --user mogstored /usr/bin/mogstored --daemon
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mogstored
-}
-
-stop() {
-	echo -n $"Stopping MogileFS tracker daemon: "
-	killproc mogstored
-	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/mogstored
-}
-
-restart() {
-	stop
-	start
-}
-
-case "$1" in
-  start)
-	start
-	;;
-  stop) 
-	stop
-	;;
-  restart|force-reload|reload)
-	restart
-	;;
-  condrestart)
-	[ -f /var/lock/subsys/mogstored ] && restart
-	;;
-  status)
-	status mogstored
-	RETVAL=$?
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
-	exit 1
-esac
-
-exit $RETVAL
-
diff --git a/mogstored.service b/mogstored.service
new file mode 100644
index 0000000..df54e8a
--- /dev/null
+++ b/mogstored.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=MogileFS storage daemon
+Documentation=man:mogstored(1)
+
+[Service]
+Type=simple
+User=mogstored
+ExecStart=/usr/bin/mogstored
+
+[Install]
+WantedBy=multi-user.target
diff --git a/perl-mogilefs-server.spec b/perl-mogilefs-server.spec
index 958c205..9e75f6e 100644
--- a/perl-mogilefs-server.spec
+++ b/perl-mogilefs-server.spec
@@ -6,8 +6,8 @@ License:    GPL+ or Artistic
 Group:      System Environment/Daemons
 URL:        http://search.cpan.org/dist/mogilefs-server/
 Source0:    http://search.cpan.org/CPAN/authors/id/D/DO/DORMANDO/mogilefs-server-%{version}.tar.gz
-Source1:    mogstored.init
-Source2:    mogilefsd.init
+Source1:    mogstored.service
+Source2:    mogilefsd.service
 Source3:    mogilefsd.conf
 Source4:    mogilefs.conf
 Patch0:     mogilefs-remove_deps.patch
@@ -18,6 +18,7 @@ BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  make
 BuildRequires:  sed
+BuildRequires:  systemd
 # Run-time:
 BuildRequires:  perl(base)
 BuildRequires:  perl(bytes)
@@ -92,13 +93,12 @@ Server part of the MogileFS distributed filesystem
 %package -n mogilefsd
 Summary:        MogileFS tracker daemon
 Group:          System Environment/Daemons
-Requires:       initscripts
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
-Requires(pre):  glibc-common
-Requires(pre):  shadow-utils
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
+Requires(pre):      glibc-common
+Requires(pre):      shadow-utils
+Requires(post):     systemd
+Requires(preun):    systemd
+Requires(postun):   systemd
 
 %description -n mogilefsd
 The MogileFS tracker daemon mogilefsd
@@ -109,15 +109,14 @@ Summary:        MogileFS storage daemon
 Group:          System Environment/Daemons
 BuildRequires:  perl(Gearman::Client::Async)
 BuildRequires:  perl(Gearman::Server)
-Requires:       initscripts
 Requires:       sysstat
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Mogstored::HTTPServer::None)
-Requires(pre):  glibc-common
-Requires(pre):  shadow-utils
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
+Requires(pre):      glibc-common
+Requires(pre):      shadow-utils
+Requires(post):     systemd
+Requires(preun):    systemd
+Requires(postun):   systemd
 
 %description -n mogstored
 The MogileFS storage daemon mogstored
@@ -186,9 +185,9 @@ make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} \;
 %{_fixperms} %{buildroot}/*
 
-install -d -m0755 %{buildroot}%{_initrddir}
-install -p -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/mogstored
-install -p -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/mogilefsd
+install -d -m0755 %{buildroot}%{_unitdir}
+install -p -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/mogstored.service
+install -p -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/mogilefsd.service
 
 install -d -m0755 %{buildroot}%{_sysconfdir}/mogilefs
 install -p -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/mogilefs/mogilefsd.conf
@@ -214,17 +213,13 @@ getent passwd mogilesd >/dev/null || \
 exit 0
 
 %post -n mogilefsd
-if [ $1 -eq 1 ]; then
-    /sbin/chkconfig --add mogilefsd
-fi
-
+%systemd_post mogilefsd.service
 
 %preun -n mogilefsd
-if [ $1 -eq 0 ]; then
-    /sbin/service mogilefsd stop >/dev/null 2>&1 || :
-    /sbin/chkconfig --del mogilefsd
-fi
+%systemd_preun mogilefsd.service
 
+%postun -n mogilefsd
+%systemd_postun_with_restart mogilefsd.service
 
 %pre -n mogstored
 getent group mogstored >/dev/null || groupadd -r mogstored
@@ -233,19 +228,14 @@ getent passwd mogstored >/dev/null || \
     -c "MogileFS storage daemon" mogstored
 exit 0
 
-
 %post -n mogstored
-if [ $1 -eq 1 ]; then
-    /sbin/chkconfig --add mogstored
-fi
-
+%systemd_post mogstored.service
 
 %preun -n mogstored
-if [ $1 -eq 0 ]; then
-    /sbin/service mogstored stop >/dev/null 2>&1 || :
-    /sbin/chkconfig --del mogstored
-fi
+%systemd_preun mogstored.service
 
+%postun -n mogstored
+%systemd_postun_with_restart mogstored.service
 
 %files -n mogilefsd
 %doc CHANGES TODO doc/
@@ -258,7 +248,7 @@ fi
 %dir %{_sysconfdir}/mogilefs
 %config(noreplace) %{_sysconfdir}/mogilefs/mogilefs.conf
 %config(noreplace) %{_sysconfdir}/mogilefs/mogilefsd.conf
-%{_initrddir}/mogilefsd
+%{_unitdir}/mogilefsd.service
 
 %files -n mogstored
 %{_bindir}/mogstored
@@ -270,7 +260,7 @@ fi
 %{perl_vendorlib}/Mogstored/FIDStatter.pm
 %{perl_vendorlib}/Mogstored/HTTPServer.pm
 %{perl_vendorlib}/Mogstored/SideChannel*
-%{_initrddir}/mogstored
+%{_unitdir}/mogstored.service
 
 %files -n mogstored-backend-perlbal
 %{perl_vendorlib}/Mogstored/HTTPServer/Perlbal.pm
@@ -288,6 +278,7 @@ fi
 %changelog
 * Thu Oct 29 2015 Petr Pisar <ppisar at redhat.com> - 2.36-15
 - Modernize specification file
+- Migrate from System V init scripts to systemd
 
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.36-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-- 
cgit v0.11.2


	http://pkgs.fedoraproject.org/cgit/perl-mogilefs-server.git/commit/?h=master&id=08742dfa7ef6dfad7344f5ef30cbbed56ae14245
