merge dev

s6/debian-root/etc/cont-init.d/20-start.sh

@@ -1,10 +1,13 @@
 #!/usr/bin/with-contenv bash
-bashCmd='bash'
+set -e
+
+bashCmd='bash -e'
 if [ "${PH_VERBOSE:-0}" -gt 0 ] ; then 
     set -x ;
-    bashCmd='bash -x'
+    bashCmd='bash -ex'
 fi
 
+
 # Early DNS Startup for the gravity list process to use
 dnsmasq -7 /etc/dnsmasq.d