[Debian-live-changes] r1972 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-04 15:53:59 +0000 (Mon, 04 Jun 2007)
New Revision: 1972

Modified:
   dists/trunk/live-helper/helpers/lh_chroot_preseed
Log:


Modified: dists/trunk/live-helper/helpers/lh_chroot_preseed
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_preseed	2007-06-04 14:49:08 UTC (rev 1971)
+++ dists/trunk/live-helper/helpers/lh_chroot_preseed	2007-06-04 15:53:59 UTC (rev 1972)
@@ -32,6 +32,11 @@
 Read_conffile config/source
 Set_defaults
 
+if [ -z "${LIVE_PRESEED}" ]
+then
+	exit 0
+fi
+
 Echo_message "Begin executing preseed..."
 
 # Requiring stage file
@@ -46,30 +51,27 @@
 # Creating lock file
 Create_lockfile .lock
 
-if [ -n "${LIVE_PRESEED}" ]
+if [ -f "${LIVE_PRESEED}" ]
 then
-	if [ -f "${LIVE_PRESEED}" ]
-	then
-		# Check dependency
-		Check_package chroot/usr/bin/debconf-set-selections debconf
+	# Check dependency
+	Check_package chroot/usr/bin/debconf-set-selections debconf
 
-		# Install dependency
-		Install_package
+	# Install dependency
+	Install_package
 
-		# Copying preseed
-		cp "${LIVE_PRESEED}" chroot/root/preseed
+	# Copying preseed
+	cp "${LIVE_PRESEED}" chroot/root/preseed
 
-		Chroot "debconf-set-selections /root/preseed"
+	Chroot "debconf-set-selections /root/preseed"
 
-		# Removing preseed file
-		rm -f chroot/root/preseed
+	# Removing preseed file
+	rm -f chroot/root/preseed
 
-		# Remove dependency
-		Remove_package
+	# Remove dependency
+	Remove_package
 
-		# Creating stage file
-		Create_stagefile .stage/chroot_preseed
-	fi
+	# Creating stage file
+	Create_stagefile .stage/chroot_preseed
 else
 	Echo_error "'${LIVE_PRESEED}' file doesn't exists."
 	exit 1