mirrors/clatd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove upstart support

Browse Source 
Upstart has been discontinued for more than a decade, and no modern
distributions are using it anymore, so get rid of it.
This commit is contained in:
Tore Anderson
2025-02-02 09:18:20 +01:00
parent 6a582bf1e4
commit cc64d0c6f3
4 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -4,7 +4,6 @@ SYSCONFDIR=/etc
APT_GET:=$(shell which apt-get) APT_GET:=$(shell which apt-get)
DNF_OR_YUM:=$(shell which dnf || which yum) DNF_OR_YUM:=$(shell which dnf || which yum)
INITCTL:=$(shell which initctl)
SYSTEMCTL:=$(shell which systemctl) SYSTEMCTL:=$(shell which systemctl)
TAYGA:=$(shell which tayga) TAYGA:=$(shell which tayga)
@@ -16,8 +15,6 @@ install:
# Install systemd service file if applicable for this system # 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 -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 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 # 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 if test -d $(DESTDIR)$(SYSCONFDIR)/NetworkManager/dispatcher.d; then install -m0755 scripts/clatd.networkmanager $(DESTDIR)$(SYSCONFDIR)/NetworkManager/dispatcher.d/50-clatd; fi

4
README.pod
View File

@@ -64,7 +64,7 @@ configuration file. Refer to the section B<CONFIGURATION> below for more info.
=head1 INVOCATION =head1 INVOCATION
B<clatd> is meant to be run under a daemonising control process such as B<clatd> 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 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. 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 It may also be run directly from the command line. It will run until killed
@@ -87,7 +87,7 @@ of B<clatd> and its dependencies:
=back =back
This will install B<clatd> to /usr/sbin, plus install systemd, upstart, and/or This will install B<clatd> to /usr/sbin, plus install systemd, and/or
NetworkManager scripts if your distribution appears to be using them, and 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 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 distros (in particular RHEL and its clones). It is however available in EPEL

5
scripts/clatd.networkmanager
View File

@@ -29,8 +29,3 @@
if which systemctl &> /dev/null; then if which systemctl &> /dev/null; then
systemctl --no-block restart clatd.service systemctl --no-block restart clatd.service
fi fi
# upstart-based distros
if test -x /sbin/initctl; then
/sbin/initctl restart clatd
fi

16
scripts/clatd.upstart
View File

@@ -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 <tore@fud.no>
#
description "464XLAT CLAT daemon"
author "Tore Anderson <tore@fud.no>"
start on net-device-up
stop on runlevel [!2345]
exec /usr/sbin/clatd