[SCM] live-config branch, debian, updated. debian/3.0_a30-1-6-g3802832

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 2e84115db3d416c92e364e72296ba2a890902bc7
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Dec 3 20:52:58 2011 +0100

    Make sure user is not in sudo group if sudo is disabled.

diff --git a/scripts/config.sh b/scripts/config.sh
index df3b9f6..896e5fa 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -63,6 +63,8 @@ Cmdline ()
 				# Disable root access, no matter what mechanism
 				_SCRIPTS="${_SCRIPTS:-$(ls /lib/live/config/*)}"
 				LIVE_NOCONFIGS="${LIVE_NOCONFIGS},sudo,policykit"
+
+				_NO_ROOT="true"
 				;;
 
 			live-config.noautologin|noautologin)
diff --git a/scripts/config/002-user-setup b/scripts/config/002-user-setup
index 3298b21..f628837 100755
--- a/scripts/config/002-user-setup
+++ b/scripts/config/002-user-setup
@@ -48,6 +48,12 @@ Configure_user_setup ()
 		return
 	fi
 
+	# Make sure user is not in sudo group if sudo is disabled
+	if [ "${_NO_ROOT}" = "true" ]
+	then
+		LIVE_USER_DEFAULT_GROUPS="$(echo ${LIVE_USER_DEFAULT_GROUPS} | sed -e 's|sudo||')"
+	fi
+
 	# Default password is: live
 	# passwords can be generated with 'echo "live" | mkpasswd -s',
 	# a blank password is 'U6aMy0wojraho'.

-- 
live-config