New service controller

diff --git a/distrib/initscripts/Makefile.am b/distrib/initscripts/Makefile.am
index becfbbd3a7ab58c51c0a49c5622edd3e93c987dc..c75f4506f111f88b282b3492d02a3e468239cf67 100644 (file)
--- a/distrib/initscripts/Makefile.am
+++ b/distrib/initscripts/Makefile.am
@@ -16,30 +16,24 @@ pkgconfdir = @PKGCONFDIR@
            <$< >$@
 
 GENERATED_FILES = \
-       rc.afpd.netbsd          \
-       rc.atalk.redhat-sysv    \
-       rc.atalk.tru64          \
-       rc.atalk.bsd            \
-       rc.atalk.suse-sysv      \
-       rc.cnid_metad.netbsd    \
-       rc.atalk.sysv           \
-       rc.atalk.gentoo         \
-       rc.atalk.debian         \
-       service.atalk.systemd   \
-       service.atalk-cnid.systemd
+       rc.bsd \
+       rc.debian \
+       rc.gentoo \
+       rc.netbsd \
+       rc.redhat \
+       rc.solaris \
+       rc.suse \
+       service.netatalk.systemd
 
 TEMPLATES = \
-       rc.afpd.netbsd.tmpl             \
-       rc.atalk.redhat-sysv.tmpl       \
-       rc.atalk.tru64.tmpl             \
-       rc.atalk.bsd.tmpl               \
-       rc.atalk.suse-sysv.tmpl         \
-       rc.cnid_metad.netbsd.tmpl       \
-       rc.atalk.sysv.tmpl              \
-       rc.atalk.gentoo.tmpl            \
-       rc.atalk.debian.tmpl            \
-       service.atalk.systemd.tmpl      \
-       service.atalk-cnid.systemd.tmpl
+       rc.bsd.tmpl \
+       rc.debian.tmpl \
+       rc.gentoo.tmpl \
+       rc.netbsd.tmpl \
+       rc.redhat.tmpl \
+       rc.solaris.tmpl \
+       rc.suse.tmpl \
+       service.netatalk.systemd.tmpl
 
 CLEANFILES = $(GENERATED_FILES) $(sysv_SCRIPTS) $(service_DATA) afpd cnid_metad
 EXTRA_DIST = $(TEMPLATES)
@@ -59,8 +53,8 @@ if USE_REDHAT_SYSV
 sysvdir        = /etc/rc.d/init.d
 sysv_SCRIPTS = netatalk
 
-$(sysv_SCRIPTS): rc.atalk.redhat-sysv
-       cp -f rc.atalk.redhat-sysv $(sysv_SCRIPTS)
+$(sysv_SCRIPTS): rc.redhat
+       cp -f rc.redhat $(sysv_SCRIPTS)
        chmod a+x $(sysv_SCRIPTS)
 
 install-data-hook:
@@ -79,13 +73,10 @@ endif
 if USE_SYSTEMD
 
 servicedir     = /lib/systemd/system
-service_DATA   = netatalk.service netatalk-cnid.service 
+service_DATA   = netatalk.service
 
-netatalk.service: service.atalk.systemd
-       cp -f service.atalk.systemd netatalk.service
-
-netatalk-cnid.service: service.atalk-cnid.systemd
-       cp -f service.atalk-cnid.systemd netatalk-cnid.service
+netatalk.service: service.netatalk.systemd
+       cp -f service.netatalk.systemd netatalk.service
 
 install-data-hook:
        -systemctl daemon-reload
@@ -93,7 +84,6 @@ install-data-hook:
 uninstall-startup:
        -systemctl disable $(service_DATA)
        rm -f $(DESTDIR)$(servicedir)/netatalk.service
-       rm -f $(DESTDIR)$(servicedir)/netatalk-cnid.service
        -systemctl daemon-reload
 
 endif
@@ -107,8 +97,8 @@ if USE_SUSE_SYSV
 sysvdir        = /etc/init.d
 sysv_SCRIPTS = netatalk
 
-$(sysv_SCRIPTS): rc.atalk.suse-sysv
-       cp -f rc.atalk.suse-sysv $(sysv_SCRIPTS)
+$(sysv_SCRIPTS): rc.suse
+       cp -f rc.suse $(sysv_SCRIPTS)
        chmod a+x $(sysv_SCRIPTS)
 
 install-data-hook:
@@ -120,27 +110,6 @@ uninstall-startup:
 
 endif
 
-#
-# checking for "tru64" style sysv scripts:
-#
-
-if USE_TRU64
-
-sysvdir        = /etc/init.d
-sysv_SCRIPTS = netatalk
-
-$(sysv_SCRIPTS): rc.atalk.tru64
-       cp -f rc.atalk.tru64 $(sysv_SCRIPTS)
-       chmod a+x $(sysv_SCRIPTS)
-
-install-data-hook:
-
-uninstall-hook:
-
-uninstall-startup: uninstall-am
-
-endif
-
 #
 # checking for NetBSD init scripts
 #
@@ -148,13 +117,9 @@ endif
 if USE_NETBSD
 
 sysvdir = /etc/rc.d
-sysv_SCRIPTS = afpd cnid_metad
-
-afpd: rc.afpd.netbsd
-       cp -f $< $@
-       chmod a+x $@
+sysv_SCRIPTS = netatalk
 
-cnid_metad: rc.cnid_metad.netbsd
+netatalk: rc.netbsd
        cp -f $< $@
        chmod a+x $@
 
@@ -175,8 +140,8 @@ if USE_SOLARIS
 sysvdir = /etc/init.d
 sysv_SCRIPTS = netatalk
 
-$(sysv_SCRIPTS): rc.atalk.sysv
-       cp -f rc.atalk.sysv $@
+$(sysv_SCRIPTS): rc.solaris
+       cp -f rc.solaris $@
        chmod a+x $@
 
 install-data-hook:
@@ -201,8 +166,8 @@ if USE_GENTOO
 sysvdir = /etc/init.d
 sysv_SCRIPTS = netatalk
 
-$(sysv_SCRIPTS): rc.atalk.gentoo
-       cp -f rc.atalk.gentoo $(sysv_SCRIPTS)
+$(sysv_SCRIPTS): rc.gentoo
+       cp -f rc.gentoo $(sysv_SCRIPTS)
        chmod a+x $(sysv_SCRIPTS)
 
 install-data-hook:
@@ -223,8 +188,8 @@ if USE_DEBIAN
 sysvdir = /etc/init.d
 sysv_SCRIPTS = netatalk
 
-$(sysv_SCRIPTS): rc.atalk.debian
-       cp -f rc.atalk.debian $(sysv_SCRIPTS)
+$(sysv_SCRIPTS): rc.debian
+       cp -f rc.debian $(sysv_SCRIPTS)
        chmod a+x $(sysv_SCRIPTS)
 
 install-data-hook: