Merge pull request #6 from mariux64/fix-mxstartup-problems

Fix mxstartup problems
mariux64 · Jan 4, 2019 · 06ba2f6 · 06ba2f6
2 parents 0104a80 + 7dd182d
commit 06ba2f6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -8,8 +8,7 @@ all:
 
 install:
 	mkdir -p -m 0755 ${DESTDIR}${SYSTEMDSYSTEMDIR}
-	install -m 0644 mxstartup-mxvip.service    ${DESTDIR}${SYSTEMDSYSTEMDIR}
-	install -m 0644 mxstartup-classic.service  ${DESTDIR}${SYSTEMDSYSTEMDIR}
+	install -m 0644 mxstartup.service  ${DESTDIR}${SYSTEMDSYSTEMDIR}
 	mkdir -p -m 0755 ${DESTDIR}${SBINDIR}
 	install -m 0755 mxstartup2mxconfig         ${DESTDIR}${SBINDIR}
 	install -m 0755 mxvipctl                   ${DESTDIR}${SBINDIR}

diff --git a/mxservicectl b/mxservicectl
@@ -21,7 +21,7 @@ function mxsrv_start_one() {
 
    case "${MX_SRV_SCRIPT}" in
        *.service)
-           systemctl start "${MX_SRV_SCRIPT}"
+           systemctl start "${MX_SRV_SCRIPT}" || true
            ;;
        *)
            su - ${MX_SRV_USER} -c "${MX_SRV_SCRIPT} start" &
@@ -43,7 +43,7 @@ function mxsrv_stop_one() {
 
    case "${MX_SRV_SCRIPT}" in
        *.service)
-           systemctl stop "${MX_SRV_SCRIPT}"
+           systemctl stop "${MX_SRV_SCRIPT}" || true
            ;;
        *)
            su - ${MX_SRV_USER} -c "${MX_SRV_SCRIPT} stop" &

diff --git a/mxstartup-mxvip.service b/mxstartup-mxvip.service
diff --git a/mxstartup-classic.service → mxstartup.service b/mxstartup-classic.service → mxstartup.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Mariux mxstartup classic
-After=mxstartup-mxvip.service mxmount.service nis.service
-Requires=mxstartup-mxvip.service mxmount.service
+After=mxmount.service nis.service
+Requires=mxmount.service
 
 [Service]
 Type=oneshot