From 49524055a1fd813b8032af88ddda838a856128dd Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:04:46 +0200
Subject: Adding live-helper 1.0~a1-2.

---
 debian/changelog           |  8 ++++++++
 doc/ChangeLog              | 11 +++++++++--
 functions/defaults.sh      | 11 +++++++----
 helpers/lh_chroot_sysvinit |  2 +-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 053e68a..c48d85e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+live-helper (1.0~a1-2) unstable; urgency=low
+
+  * functions/defaults.sh: Fixed setting of LIVE_SYSVINIT.
+  * helpers/lh_chroot_sysvinit: Changed check for LIVE_SYSVINIT from disabled to
+    enabled.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 12 Mar 2007 18:00:00 +0100
+
 live-helper (1.0~a1-1) unstable; urgency=low
 
   * Initial release, replacing live-package.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index fff6279..ad0c984 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,11 @@
+2007-03-14 Daniel Baumann <daniel@debian.org>
+
+  * functions/defaults.sh: Fixed setting of LIVE_SYSVINIT.
+  * helpers/lh_chroot_sysvinit: Changed check for LIVE_SYSVINIT from disabled to
+    enabled.
+  * Uploaded 1.0~a1-2.
+
 2007-03-12 Daniel Baumann <daniel@debian.org>
 
-	* Rewritten live-package.
-	* Uploaded 1.0~a1-1.
+  * Rewritten live-package.
+  * Uploaded 1.0~a1-1.
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 462c1eb..9463ad6 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -287,11 +287,14 @@ Set_defaults ()
 	fi
 
 	# Setting sysvinit option
-	if [ -z "${LIVE_SYSVINIT}" ] && [ "${LIVE_FLAVOUR}" != "mini" ]
+	if [ -z "${LIVE_SYSVINIT}" ]
 	then
-		LIVE_SYSVINIT="enabled"
-	else
-		LIVE_SYSVINIT="disabled"
+		if [ "${LIVE_FLAVOUR}" = "mini" ]
+		then
+			LIVE_SYSVINIT="enabled"
+		else
+			LIVE_SYSVINIT="disabled"
+		fi
 	fi
 
 	## config/image
diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit
index e4746d6..933da57 100755
--- a/helpers/lh_chroot_sysvinit
+++ b/helpers/lh_chroot_sysvinit
@@ -27,7 +27,7 @@ Create_lockfile "${LIVE_ROOT}"/.lock
 # Checking stage file
 Check_stagefile "${LIVE_ROOT}"/.stage/chroot_sysvinit
 
-if [ "${LIVE_SYSVINIT}" = "disabled" ]
+if [ "${LIVE_SYSVINIT}" = "enabled" ]
 then
 	# Disable all
 	for FILE in "${LIVE_CHROOT}"/etc/init.d/*
-- 
cgit v1.0