From: HAT <hat@fa2.so-net.ne.jp>
Date: Sat, 24 Mar 2012 16:53:23 +0000 (+0900)
Subject: update redhat-systemd service file
X-Git-Url: https://arthur.barton.de/gitweb/?p=netatalk.git;a=commitdiff_plain;h=bb6fd82ff3029d84c62ecedbcacc2f3578f8d487

update redhat-systemd service file
---

diff --git a/distrib/initscripts/.gitignore b/distrib/initscripts/.gitignore
index 24f061b4..949e409a 100644
--- a/distrib/initscripts/.gitignore
+++ b/distrib/initscripts/.gitignore
@@ -1,14 +1,14 @@
 Makefile
 Makefile.in
-rc.atalk.bsd
-rc.atalk.redhat-sysv
-rc.atalk.suse-sysv
-rc.atalk.tru64
-rc.atalk.sysv
-service.atalk.systemd
-service.atalk-cnid.systemd
+rc.bsd
+rc.debian
+rc.gentoo
+rc.netbsd
+rc.redhat
+rc.solaris
+rc.suse
+service.systemd
 netatalk
 netatalk.service
-netatalk-cnid.service
 .gitignore
 *.o
diff --git a/distrib/initscripts/Makefile.am b/distrib/initscripts/Makefile.am
index c75f4506..0987865f 100644
--- a/distrib/initscripts/Makefile.am
+++ b/distrib/initscripts/Makefile.am
@@ -23,7 +23,7 @@ GENERATED_FILES = \
 	rc.redhat \
 	rc.solaris \
 	rc.suse \
-	service.netatalk.systemd
+	service.systemd
 
 TEMPLATES = \
 	rc.bsd.tmpl \
@@ -33,7 +33,7 @@ TEMPLATES = \
 	rc.redhat.tmpl \
 	rc.solaris.tmpl \
 	rc.suse.tmpl \
-	service.netatalk.systemd.tmpl
+	service.systemd.tmpl
 
 CLEANFILES = $(GENERATED_FILES) $(sysv_SCRIPTS) $(service_DATA) afpd cnid_metad
 EXTRA_DIST = $(TEMPLATES)
@@ -75,8 +75,8 @@ if USE_SYSTEMD
 servicedir	= /lib/systemd/system
 service_DATA	= netatalk.service
 
-netatalk.service: service.netatalk.systemd
-	cp -f service.netatalk.systemd netatalk.service
+netatalk.service: service.systemd
+	cp -f service.systemd netatalk.service
 
 install-data-hook:
 	-systemctl daemon-reload
diff --git a/distrib/initscripts/service.netatalk.systemd.tmpl b/distrib/initscripts/service.netatalk.systemd.tmpl
deleted file mode 100644
index a99baae1..00000000
--- a/distrib/initscripts/service.netatalk.systemd.tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is part of netatalk :NETATALK_VERSION:.
-
-[Unit]
-Description=Netatalk AFP fileserver for Macintosh clients
-After=syslog.target network.target avahi-daemon.service netatalk-cnid.service
-
-[Service]
-Type=forking
-GuessMainPID=no
-ExecStart=:SBINDIR:/netatalk
-Restart=always
-RestartSec=1
-
-[Install]
-WantedBy=multi-user.target
diff --git a/distrib/initscripts/service.systemd.tmpl b/distrib/initscripts/service.systemd.tmpl
new file mode 100644
index 00000000..2183f303
--- /dev/null
+++ b/distrib/initscripts/service.systemd.tmpl
@@ -0,0 +1,15 @@
+# This file is part of netatalk :NETATALK_VERSION:.
+
+[Unit]
+Description=Netatalk AFP fileserver for Macintosh clients
+After=syslog.target network.target avahi-daemon.service
+
+[Service]
+Type=forking
+GuessMainPID=no
+ExecStart=:SBINDIR:/netatalk
+Restart=always
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target