X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=overlay-stop;h=2788413e97900fb13329056a051f5408240852d3;hb=e167fa970f34adaeeac05db7e57c7d6b5307bb2d;hp=d1e89acf581b8459e5aaf7a7f06627aa3a53e440;hpb=1d2caf8010011eac8f6e5d79cac03abcb6018953;p=rrq%2Foverlay-boot.git

diff --git a/overlay-stop b/overlay-stop
index d1e89ac..2788413 100755
--- a/overlay-stop
+++ b/overlay-stop
@@ -2,12 +2,17 @@
 #
 # Script to stop the nominated overlay subhost
 
+OVERLAYDIR="$(dirname $(realpath $0))"
+
 [ $(id -u) = 0 ] || exec sudo $0 $@
-. $(dirname $(realpath $0))/functions XXX
+. $OVERLAYDIR/functions $*
 
-NAME="$1"
+CONFIG="$1"
+[ -r "$CONFIG" ] || die "Missing configuration $CONFIG"
 
-[ -z "$NAME" ] && echo "Select subhost: $(list_running)" && exit 0
+config NAME $(basename $1 .${1##*.})
+config START "ssh networking"
+config LIVE
 
 read USPID RSPID <<EOF
 $(is_live $NAME)
@@ -23,5 +28,16 @@ EOF
     exit 1
 fi
 
-CHILDPIDS="$(nsenter -t $RSPID -p -m ps -hopid --ppid 1)"
-nsenter -t $RSPID -p -m kill $CHILDPIDS
+# function to reverse the $* words
+reverse() {
+    local OUT=""
+    for w in $* ; do OUT="$w $OUT" ; done
+    echo "${OUT% }"
+}
+
+START="$(reverse "$START")"
+if nsenter -t $RSPID -p -m -i -u ip netns exec $NAME chroot $LIVE /bin/sh \
+	   -c "for srv in $START ; do service \$srv stop ; done" ; then
+    CHILDPIDS="$(nsenter -t $RSPID -p -m ps -hopid --ppid 1)"
+    nsenter -t $RSPID -p -m kill $CHILDPIDS
+fi