Merge remote-tracking branch 'origin/develop'

iocage

@@ -85,11 +85,10 @@ if [ "$1" == "help" ] ; then
     exit 0
 fi
 
-if [ ! __readonly_cmd $1 -a "$(whoami)" != "root" ] ; then
+if ! __readonly_cmd $1 && [ "$(whoami)" != "root" ] ; then
     echo "* The $1 command needs root credentials!"
     exit 1
 fi
-
 # Did not work when included as an OR below, workaround for that
 if [ "$1" == "deactivate" ] ; then
     shift

lib/ioc-cmd

@@ -1,5 +1,15 @@
 #!/bin/sh
 
+# See whether given command is readonly
+# and therefore doesn't need root credentials
+__readonly_cmd () {
+    case "$1" in
+        defaults|df|get|list) return 0;;
+    esac
+
+    return 1
+}
+
 # Process command line options-------------------------
 __parse_cmd () {
     while [ $# -gt 0 ] ; do