fix init script, revbump

1 files changed, 21 insertions, 30 deletions

diff --git a/dev-util/schroot/files/schroot.initd b/dev-util/schroot/files/schroot.initd
index a9a15e2349fb..76ca9944532d 100644
--- a/dev-util/schroot/files/schroot.initd
+++ b/dev-util/schroot/files/schroot.initd
@@ -5,33 +5,32 @@ depend() {
 	after net netmount
 }
 
-recover_sessions() {
-	einfo "Recovering schroot sessions"
-	eindent
-	local chroot
-	local chroots="$(schroot --all-sessions --list --quiet)"
-	if [ -n "${chroots}" ]; then
-		for chroot in ${chroots}; do
-			ebegin "$chroot"
-			schroot --chroot=$chroot --recover-session
-			eend $?
-		done
-	else
-		einfo "(none)"
-	fi
-	eoutdent
-	einfo "...done"
-}
+start() {
+	local msg param
+	case "${SESSIONS_RECOVER}" in
+		end)
+			msg="Ending"
+			param="--end-session"
+			;;
+		recover|"")
+			msg="Recovering"
+			param="--recover-session"
+			;;
+		*)
+			ewarn "Invalid value \"$SESSIONS_RECOVER\" for \$SESSIONS_RECOVER, using \"recover\""
+			msg="Recovering"
+			param="--recover-session"
+			;;
+	esac
 
-end_sessions() {
-	einfo "Ending schroot sessions"
+	einfo "$msg schroot sessions"
 	eindent
 	local chroot
 	local chroots="$(schroot --all-sessions --list --quiet)"
-	if [ -n "${chroots}" ]; then
-		for chroot in ${chroots}; do
+	if [ -n "$chroots" ]; then
+		for chroot in $chroots; do
 			ebegin "$chroot"
-			schroot --chroot=$chroot --recover-session
+			schroot --chroot=$chroot $param
 			eend $?
 		done
 	else
@@ -40,11 +39,3 @@ end_sessions() {
 	eoutdent
 	einfo "...done"
 }
-
-start() {
-	if [ "${SESSIONS_RECOVER}" = "end" ]; then
-		end_sessions
-	else
-		recover_sessions
-	fi
-}