Skip to content

Fix mxstartup problems #6

Merged
merged 3 commits into from
Jan 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions mxservicectl
Original file line number Diff line number Diff line change
Expand Up @@ -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" &
Expand All @@ -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" &
Expand Down
15 changes: 0 additions & 15 deletions mxstartup-mxvip.service

This file was deleted.

4 changes: 2 additions & 2 deletions mxstartup-classic.service → mxstartup.service
Original file line number Diff line number Diff line change
@@ -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
Expand Down