From 37a5c53ddd2825bf6b0ce521908a63d419683981 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:05:11 +0200
Subject: Adding live-helper 1.0~a14-1.

---
 functions/common.sh   |  2 +-
 functions/defaults.sh | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'functions')

diff --git a/functions/common.sh b/functions/common.sh
index 19e256641..5c25e29b0 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
 set -e
 
 PROGRAM="`basename ${0}`"
-VERSION="1.0~a13"
+VERSION="1.0~a14"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 3c80b9064..8179ec3e9 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -171,11 +171,17 @@ Set_defaults ()
 		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"
+			LIVE_ROOT_COMMAND=""
+		fi
 	fi
 
 	# Setting tasksel
@@ -425,6 +431,9 @@ Set_defaults ()
 	# Setting packages list string
 	LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS:-standard}"
 
+	# Setting package preseed
+	# LIVE_PRESEED
+
 	# Setting tasks string
 	for LIST in ${LIVE_PACKAGES_LISTS}
 	do
@@ -579,5 +588,5 @@ Set_defaults ()
 	LIVE_SOURCE="${LIVE_SOURCE:-disabled}"
 
 	# Setting image type
-	LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES:-generic}"
+	LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES:-tar}"
 }
-- 
cgit v1.2.3