From cd2a60251bf6c2bb6f38e4a60510e002beb85f1e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 20 Nov 2013 14:50:46 +0100
Subject: [rootfs-stage32] Also use prio servers for dnbd3 stage4

---
 .../rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'remote/rootfs')

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export
index fd3e1b0a..66345cd1 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export
@@ -9,13 +9,13 @@ mkdir -p "$MOUNTPOINT"
 
 if [[ "$SLX_STAGE4" == dnbd3* ]]; then
 	# dnbd3 it is
-	[ -z "${SLX_DNBD3_SERVERS}" ] && { echo "SLX_DNBD3_SERVERS empty or not set in /opt/openslx/config." && exit 1; }
+	[ -z "${SLX_DNBD3_SERVERS}${SLX_DNBD3_PRIO_SERVERS}" ] && { echo "SLX_DNBD3(_PRIO)_SERVERS empty or not set in /opt/openslx/config." && exit 1; }
 	# Randomize list
 	SERVERS=$(for SERVER in $SLX_DNBD3_SERVERS; do echo "$RANDOM $SERVER"; done | sort -u | sed -r 's/^[0-9]+ //')
 	IMAGE=$(echo $SLX_STAGE4 | awk '{printf $2}')
 	[ -e /var/run/dnbd3.socket ] || sleep 2 # Ugly, service should only start when dnbd3 daemon is up and running
 	RET=1337
-	for SRV in $SERVERS; do
+	for SRV in $SLX_DNBD3_PRIO_SERVERS $SERVERS; do
 		echo "Requesting $IMAGE from $SRV"
 		dnbd3=$(dnbd3-client -h "$SRV" -i "$IMAGE" -r 0)
 		RET=$?
-- 
cgit v1.2.3-55-g7522


From 353745939c2797ff7fd8ec9cbce205b0076bb4ef Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 20 Nov 2013 15:30:59 +0100
Subject: [rfs-stage32] Add delay when stage4 fails before next try

---
 .../rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export  | 1 +
 1 file changed, 1 insertion(+)

(limited to 'remote/rootfs')

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export
index 66345cd1..c71dc9f6 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_export
@@ -21,6 +21,7 @@ if [[ "$SLX_STAGE4" == dnbd3* ]]; then
 		RET=$?
 		[ "$RET" -eq "0" ] && break
 		echo "... didn't work ($RET)"
+		sleep 2
 	done
 	[ "$RET" -ne "0" ] && exit $RET
 	echo "Mounting $dnbd3 to $MOUNTPOINT"
-- 
cgit v1.2.3-55-g7522


From 546112de56a3ec7e6619edeca40e684e74ce1716 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 20 Nov 2013 22:24:31 +0100
Subject: [rfs-stage32] Fix penv util

---
 remote/rootfs/rootfs-stage32/data/opt/openslx/bin/penv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'remote/rootfs')

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/penv b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/penv
index ca5a23ac..47a055ef 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/penv
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/penv
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-[ "x$UID" != "x0" ] && echo "You need to be root." && exit 1
 [ "$#" -ne "1" ] && echo "Usage: $0 PID" && exit 1
-[ ! -d "/proc/$1/environ" ] && echo "No such process: $1" && exit 1
+[ ! -e "/proc/$1/environ" ] && echo "No such process: $1" && exit 1
+[ ! -r "/proc/$1/environ" ] && echo "Cannot open process: $1" && exit 1
 sed 's/\x0/\n/g' "/proc/$1/environ" | grep -E --color=auto '^[^=]*'
 
-- 
cgit v1.2.3-55-g7522