diff --git a/Makefile b/Makefile index 0c9b0d1..e84aa80 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ SYSCONFDIR=/etc APT_GET:=$(shell which apt-get) DNF_OR_YUM:=$(shell which dnf || which yum) -INITCTL:=$(shell which initctl) SYSTEMCTL:=$(shell which systemctl) TAYGA:=$(shell which tayga) @@ -16,8 +15,6 @@ install: # Install systemd service file if applicable for this system if test -x "$(SYSTEMCTL)" && test -d "$(DESTDIR)$(SYSCONFDIR)/systemd/system"; then install -m0644 scripts/clatd.systemd $(DESTDIR)$(SYSCONFDIR)/systemd/system/clatd.service && $(SYSTEMCTL) daemon-reload; fi if test -e "$(DESTDIR)$(SYSCONFDIR)/systemd/system/clatd.service" && test ! -e "$(DESTDIR)$(SYSCONFDIR)/systemd/system/multi-user.target.wants/clatd.service"; then $(SYSTEMCTL) enable clatd.service; fi - # Install upstart service file if applicable for this system - if test -x "$(INITCTL)" && test -d "$(DESTDIR)$(SYSCONFDIR)/init"; then install -m0644 scripts/clatd.upstart $(DESTDIR)$(SYSCONFDIR)/init/clatd.conf; fi # Install NetworkManager dispatcher script if applicable if test -d $(DESTDIR)$(SYSCONFDIR)/NetworkManager/dispatcher.d; then install -m0755 scripts/clatd.networkmanager $(DESTDIR)$(SYSCONFDIR)/NetworkManager/dispatcher.d/50-clatd; fi diff --git a/README.pod b/README.pod index fa436ca..7af905f 100644 --- a/README.pod +++ b/README.pod @@ -64,7 +64,7 @@ configuration file. Refer to the section B below for more info. =head1 INVOCATION B is meant to be run under a daemonising control process such as -systemd, upstart, or similar. It is further meant to be (re)started whenever a +systemd or similar. It is further meant to be (re)started whenever a network interface goes up/down as this might mean a change in the PLAT availability or which prefixes/addresses needs to be used for the CLAT to work. It may also be run directly from the command line. It will run until killed @@ -87,7 +87,7 @@ of B and its dependencies: =back -This will install B to /usr/sbin, plus install systemd, upstart, and/or +This will install B to /usr/sbin, plus install systemd, and/or NetworkManager scripts if your distribution appears to be using them, and install all the dependencies. Note that TAYGA isn't available in all RPM-based distros (in particular RHEL and its clones). It is however available in EPEL diff --git a/scripts/clatd.networkmanager b/scripts/clatd.networkmanager index c16ef2e..5086ced 100644 --- a/scripts/clatd.networkmanager +++ b/scripts/clatd.networkmanager @@ -29,8 +29,3 @@ if which systemctl &> /dev/null; then systemctl --no-block restart clatd.service fi - -# upstart-based distros -if test -x /sbin/initctl; then - /sbin/initctl restart clatd -fi diff --git a/scripts/clatd.upstart b/scripts/clatd.upstart deleted file mode 100644 index 761875f..0000000 --- a/scripts/clatd.upstart +++ /dev/null @@ -1,16 +0,0 @@ -# -# clatd service file for upstart -# -# Install it to: /etc/init/clatd.conf -# Start it with: initctl start clatd -# -# Written by Tore Anderson -# - -description "464XLAT CLAT daemon" -author "Tore Anderson " - -start on net-device-up -stop on runlevel [!2345] - -exec /usr/sbin/clatd