From 9126af9662dc32a73fb5157686fcbc453590da24 Mon Sep 17 00:00:00 2001 From: Tom Early Date: Thu, 11 Oct 2018 12:50:57 -0700 Subject: [PATCH] service script dependancy and Makefile cleanup and new exec_G.sh script --- Makefile | 35 +++++------------------------------ exec_G.sh | 2 ++ system/mmdvm.service | 1 - system/qndvap.service | 1 - system/qndvrptr.service | 1 - system/qnitap.service | 1 - system/qnlink.service | 4 ++-- system/qnrelay.service | 1 - 8 files changed, 9 insertions(+), 37 deletions(-) create mode 100644 exec_G.sh diff --git a/Makefile b/Makefile index 7f31f11..14893f7 100644 --- a/Makefile +++ b/Makefile @@ -243,12 +243,7 @@ uninstall : systemctl disable qnlink.service /bin/rm -f $(SYSDIR)/qnlink.service /bin/rm -f $(BINDIR)/qnlink - /bin/rm -f $(CFGDIR)/already_linked.dat - /bin/rm -f $(CFGDIR)/already_unlinked.dat - /bin/rm -f $(CFGDIR)/failed_linked.dat - /bin/rm -f $(CFGDIR)/id.dat - /bin/rm -f $(CFGDIR)/linked.dat - /bin/rm -f $(CFGDIR)/unlinked.dat + /bin/rm -f $(CFGDIR)/*.dat /bin/rm -f $(CFGDIR)/RPT_STATUS.txt /bin/rm -f $(CFGDIR)/gwys.txt /bin/rm -f $(CFGDIR)/exec_?.sh @@ -273,12 +268,7 @@ uninstallitap : systemctl disable qnlink.service /bin/rm -f $(SYSDIR)/qnlink.service /bin/rm -f $(BINDIR)/qnlink - /bin/rm -f $(CFGDIR)/already_linked.dat - /bin/rm -f $(CFGDIR)/already_unlinked.dat - /bin/rm -f $(CFGDIR)/failed_linked.dat - /bin/rm -f $(CFGDIR)/id.dat - /bin/rm -f $(CFGDIR)/linked.dat - /bin/rm -f $(CFGDIR)/unlinked.dat + /bin/rm -f $(CFGDIR)/*.dat /bin/rm -f $(CFGDIR)/RPT_STATUS.txt /bin/rm -f $(CFGDIR)/gwys.txt /bin/rm -f $(CFGDIR)/exec_?.sh @@ -303,12 +293,7 @@ uninstallicom : systemctl disable qnlink.service /bin/rm -f $(SYSDIR)/qnlink.service /bin/rm -f $(BINDIR)/qnlink - /bin/rm -f $(CFGDIR)/already_linked.dat - /bin/rm -f $(CFGDIR)/already_unlinked.dat - /bin/rm -f $(CFGDIR)/failed_linked.dat - /bin/rm -f $(CFGDIR)/id.dat - /bin/rm -f $(CFGDIR)/linked.dat - /bin/rm -f $(CFGDIR)/unlinked.dat + /bin/rm -f $(CFGDIR)/*.dat /bin/rm -f $(CFGDIR)/RPT_STATUS.txt /bin/rm -f $(CFGDIR)/gwys.txt /bin/rm -f $(CFGDIR)/exec_?.sh @@ -327,12 +312,7 @@ uninstalldvap : systemctl disable qnlink.service /bin/rm -f $(SYSDIR)/qnlink.service /bin/rm -f $(BINDIR)/qnlink - /bin/rm -f $(CFGDIR)/already_linked.dat - /bin/rm -f $(CFGDIR)/already_unlinked.dat - /bin/rm -f $(CFGDIR)/failed_linked.dat - /bin/rm -f $(CFGDIR)/id.dat - /bin/rm -f $(CFGDIR)/linked.dat - /bin/rm -f $(CFGDIR)/unlinked.dat + /bin/rm -f $(CFGDIR)/*.dat /bin/rm -f $(CFGDIR)/RPT_STATUS.txt /bin/rm -f $(CFGDIR)/gwys.txt /bin/rm -f $(CFGDIR)/exec_?.sh @@ -357,12 +337,7 @@ uninstalldvrptr : systemctl disable qnlink.service /bin/rm -f $(SYSDIR)/qnlink.service /bin/rm -f $(BINDIR)/qnlink - /bin/rm -f $(CFGDIR)/already_linked.dat - /bin/rm -f $(CFGDIR)/already_unlinked.dat - /bin/rm -f $(CFGDIR)/failed_linked.dat - /bin/rm -f $(CFGDIR)/id.dat - /bin/rm -f $(CFGDIR)/linked.dat - /bin/rm -f $(CFGDIR)/unlinked.dat + /bin/rm -f $(CFGDIR)/*.dat /bin/rm -f $(CFGDIR)/RPT_STATUS.txt /bin/rm -f $(CFGDIR)/gwys.txt /bin/rm -f $(CFGDIR)/exec_?.sh diff --git a/exec_G.sh b/exec_G.sh new file mode 100644 index 0000000..a8e47a5 --- /dev/null +++ b/exec_G.sh @@ -0,0 +1,2 @@ +#!/bin/sh +systemctl restart qngateway diff --git a/system/mmdvm.service b/system/mmdvm.service index 55cf290..3460508 100644 --- a/system/mmdvm.service +++ b/system/mmdvm.service @@ -1,6 +1,5 @@ [Unit] Description=MMDVMHost -Requires=qnrelay.service After=systemd-user-session.service qnrelay.service [Service] diff --git a/system/qndvap.service b/system/qndvap.service index c5ec6fb..525d01c 100644 --- a/system/qndvap.service +++ b/system/qndvap.service @@ -1,6 +1,5 @@ [Unit] Description=QnetDVAP -Requires=qngateway.service After=systemd-user-session.service qngateway.service [Service] diff --git a/system/qndvrptr.service b/system/qndvrptr.service index 79a15bb..ae21d75 100644 --- a/system/qndvrptr.service +++ b/system/qndvrptr.service @@ -1,6 +1,5 @@ [Unit] Description=QnetDVRPTR -Requires=qngateway.service After=systemd-user-session.service qngateway.service [Service] diff --git a/system/qnitap.service b/system/qnitap.service index 41ec92a..ebe7ee6 100644 --- a/system/qnitap.service +++ b/system/qnitap.service @@ -1,6 +1,5 @@ [Unit] Description=QnetITAP -Requires=qngateway.service After=systemd-user-session.service qngateway.service [Service] diff --git a/system/qnlink.service b/system/qnlink.service index f1dbc83..8c68ea0 100644 --- a/system/qnlink.service +++ b/system/qnlink.service @@ -1,7 +1,7 @@ [Unit] Description=QnetLink -Requires=qngateway.service -After=systemd-user-session.service qngateway.service +Requires=network.target +After=systemd-user-session.service network.target [Service] Type=simple diff --git a/system/qnrelay.service b/system/qnrelay.service index 9dfdf94..4d2f2b9 100644 --- a/system/qnrelay.service +++ b/system/qnrelay.service @@ -1,6 +1,5 @@ [Unit] Description=QnetRelay -Requires=qngateway.service After=systemd-user-session.service qngateway.service [Service]