From 74d8780b24a1f3a4b4b2cb7693dcd2589b039172 Mon Sep 17 00:00:00 2001 From: Frank Lahm Date: Tue, 29 May 2012 10:31:32 +0200 Subject: [PATCH] Replace Solaris initscript with SMF manifest --- NEWS | 4 +++ distrib/initscripts/.gitignore | 2 +- distrib/initscripts/Makefile.am | 23 +++++-------- distrib/initscripts/netatalk.xml.tmpl | 47 +++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 16 deletions(-) create mode 100644 distrib/initscripts/netatalk.xml.tmpl diff --git a/NEWS b/NEWS index 5a47f408..e51ab83f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +Changes in 3.0 beta2 +==================== +* UPD: Solaris and friends: Replace initscript with SMF manifest + Changes in 3.0 beta1 ==================== * UPD: afpd: Performance tuning of read/write AFP operations. New option diff --git a/distrib/initscripts/.gitignore b/distrib/initscripts/.gitignore index 949e409a..125825eb 100644 --- a/distrib/initscripts/.gitignore +++ b/distrib/initscripts/.gitignore @@ -10,5 +10,5 @@ rc.suse service.systemd netatalk netatalk.service -.gitignore +netatalk.xml *.o diff --git a/distrib/initscripts/Makefile.am b/distrib/initscripts/Makefile.am index 0987865f..4b88ba9d 100644 --- a/distrib/initscripts/Makefile.am +++ b/distrib/initscripts/Makefile.am @@ -23,7 +23,8 @@ GENERATED_FILES = \ rc.redhat \ rc.solaris \ rc.suse \ - service.systemd + service.systemd \ + netatalk.xml TEMPLATES = \ rc.bsd.tmpl \ @@ -33,7 +34,8 @@ TEMPLATES = \ rc.redhat.tmpl \ rc.solaris.tmpl \ rc.suse.tmpl \ - service.systemd.tmpl + service.systemd.tmpl \ + netatalk.xml.tmpl CLEANFILES = $(GENERATED_FILES) $(sysv_SCRIPTS) $(service_DATA) afpd cnid_metad EXTRA_DIST = $(TEMPLATES) @@ -137,23 +139,14 @@ endif if USE_SOLARIS -sysvdir = /etc/init.d -sysv_SCRIPTS = netatalk - -$(sysv_SCRIPTS): rc.solaris - cp -f rc.solaris $@ - chmod a+x $@ +servicedir = /lib/svc/manifest/network/ +service_DATA = netatalk.xml install-data-hook: - rm -f $(DESTDIR)/etc/rc2.d/S90$(sysv_SCRIPTS) - -ln -s ../init.d/$(sysv_SCRIPTS) $(DESTDIR)/etc/rc2.d/S90$(sysv_SCRIPTS) - rm -f $(DESTDIR)/etc/rc0.d/K04$(sysv_SCRIPTS) - -ln -s ../init.d/$(sysv_SCRIPTS) $(DESTDIR)/etc/rc0.d/K04$(sysv_SCRIPTS) + svccfg import netatalk.xml uninstall-startup: - rm -f $(DESTDIR)$(sysvdir)/$(sysv_SCRIPTS) \ - $(DESTDIR)/etc/rc2.d/S90$(sysv_SCRIPTS) \ - $(DESTDIR)/etc/rc0.d/K04$(sysv_SCRIPTS) + svccfg delete network/netatalk endif diff --git a/distrib/initscripts/netatalk.xml.tmpl b/distrib/initscripts/netatalk.xml.tmpl new file mode 100644 index 00000000..ce739545 --- /dev/null +++ b/distrib/initscripts/netatalk.xml.tmpl @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.39.2