[Debian-live-changes] r1974 - in dists/trunk/live-helper: functions helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-05 05:46:04 +0000 (Tue, 05 Jun 2007)
New Revision: 1974

Modified:
   dists/trunk/live-helper/functions/defaults.sh
   dists/trunk/live-helper/helpers/lh_config
Log:


Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-06-05 03:54:05 UTC (rev 1973)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-06-05 05:46:04 UTC (rev 1974)
@@ -171,11 +171,16 @@
 		fi
 	fi
 
-	# If we are root, disable root command
 	if [ "`id -u`" = "0" ]
 	then
-		# FIXME: this is disabled until considered safe
+		# If we are root, disable root command
 		LIVE_ROOT_COMMAND=""
+	else
+		if [ -x /usr/bin/sudo ]
+		then
+			# FIXME: this is disabled until considered safe
+			#LIVE_ROOT_COMMAND="sudo"
+		fi
 	fi
 
 	# Setting tasksel
@@ -195,9 +200,6 @@
 		esac
 	fi
 
-	# Setting root command
-	# LH_ROOT_COMMAND
-
 	# Setting includes
 	if [ -z "${LIVE_INCLUDES}" ]
 	then

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-06-05 03:54:05 UTC (rev 1973)
+++ dists/trunk/live-helper/helpers/lh_config	2007-06-05 05:46:04 UTC (rev 1974)
@@ -135,8 +135,8 @@
 LH_MODE="${LH_MODE}"
 
 # \$LH_ROOT_COMMAND: use sudo or equivalent
-# (Default: $LH_ROOT_COMMAND)
-#LH_ROOT_COMMAND="${LH_ROOT_COMMAND}"
+# (Default: empty)
+#LH_ROOT_COMMAND="sudo"
 
 # \$LH_TASKSEL: set tasksel program
 # (Default: ${LH_TASKSEL})