Merge "prototypes: xci: Do not require root privileges in xci-deploy"

2 files changed, 7 insertions, 11 deletions

diff --git a/prototypes/xci/README.rst b/prototypes/xci/README.rst
index 8318cdb52..6d7af0d6e 100644
--- a/prototypes/xci/README.rst
+++ b/prototypes/xci/README.rst
@@ -148,13 +148,7 @@ set where the logs should be stored
 
 execute sandbox script
 
-    sudo -E ./xci-deploy.sh
-
-Warning::
-
-    Please encure you always execute the sandbox script using **sudo -E**
-    in order to make the environment variables you set available to the
-    sandbox script or you end up with the default settings.
+    ./xci-deploy.sh
 
 ===============
 User Variables
diff --git a/prototypes/xci/xci-deploy.sh b/prototypes/xci/xci-deploy.sh
index 718ed73c2..2ce7c6b06 100755
--- a/prototypes/xci/xci-deploy.sh
+++ b/prototypes/xci/xci-deploy.sh
@@ -4,11 +4,13 @@ set -o nounset
 set -o pipefail
 
 #-------------------------------------------------------------------------------
-# This script must run as root
+# This script should not be run as root
 #-------------------------------------------------------------------------------
-if [[ $(whoami) != "root" ]]; then
-    echo "Error: This script must be run as root!"
-    exit 1
+if [[ $(whoami) == "root" ]]; then
+    echo "WARNING: This script should not be run as root!"
+    echo "Elevated privileges are aquired automatically when necessary"
+    echo "Waiting 10s to give you a chance to stop the script (Ctrl-C)"
+    for x in $(seq 10 -1 1); do echo -n "$x..."; sleep 1; done
 fi
 
 #-------------------------------------------------------------------------------