From 147b4caf3352ae985749b2e7d728abc7d97ce258 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Tue, 5 Jan 2016 12:05:43 +0100
Subject: [PATCH] fix startup/shutdown order of nis and mxstartup

After 4ee8fedc systems hang on shtudown until systemd times out.

Do not wait for NIS on shutdown.
Tell systemd to order nis and mxstartup in startup and shutdown
---
 mxstartup-classic.service | 2 +-
 mxstartupctl              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mxstartup-classic.service b/mxstartup-classic.service
index b2ba5ca..827854d 100644
--- a/mxstartup-classic.service
+++ b/mxstartup-classic.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Mariux mxstartup classic
-After=mxstartup-mxvip.service mxmount.service
+After=mxstartup-mxvip.service mxmount.service nis.service
 Requires=mxstartup-mxvip.service mxmount.service
 
 [Service]
diff --git a/mxstartupctl b/mxstartupctl
index 0b52f0a..8dbaf94 100755
--- a/mxstartupctl
+++ b/mxstartupctl
@@ -2,13 +2,13 @@
 
 remoteuser=molgen
 
-while ! id ${remoteuser} >/dev/null 2>&1 ; do
-    echo >&2 "WARNING: Waiting for NIS (failed to resolve remote user ${remoteuser})"
-    sleep 1
-done
 
 case "${1}" in
     start)
+        while ! id ${remoteuser} >/dev/null 2>&1 ; do
+            echo >&2 "WARNING: Waiting for NIS (failed to resolve remote user ${remoteuser})"
+            sleep 1
+        done
         mxvipctl     start $2
         mxservicectl start $2
         ;;