[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. bf58b9271b7e4ddd2dcc6ccb43cad9b9e2d4c2be

[Steffen Moeller]

The following commit has been merged in the master branch:
commit bf58b9271b7e4ddd2dcc6ccb43cad9b9e2d4c2be
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Sep 19 16:07:02 2009 +0200

    dropbear installs now.

diff --git a/install.sh b/install.sh
index 926c13e..49cfe9f 100755
--- a/install.sh
+++ b/install.sh
@@ -174,6 +174,7 @@ ensure_proc_is_mounted () {
 diverting_invoke_rc_d () {
 	if [ ! -r "$INST_DIR"/usr/sbin/invoke-rc.d.diverted ]; then
 		mv "$INST_DIR"/usr/sbin/invoke-rc.d "$INST_DIR"/usr/sbin/invoke-rc.d.diverted
+		echo "I: diverted invoke-rc.d"
 	else
 		echo "I: invoke-rc.d is already diverted - was previous install interrupted?"
 		# continuing anyway, since functional existence of dummy is not guaranteed.
@@ -190,6 +191,7 @@ EOINVOKERCD
 restoring_invoke_rc_d () {
 	if [ -f "$INST_DIR"/usr/sbin/invoke-rc.d.diverted ]; then
 		mv "$INST_DIR"/usr/sbin/invoke-rc.d.diverted "$INST_DIR"/usr/sbin/invoke-rc.d 
+		echo "I: restored invoke-rc.d"
 	else
 		echo "E: no invoke-rc.d found to be put back in place. Investigate!"
 	fi
@@ -981,7 +983,10 @@ __END__
 	chroot "$INST_DIR" apt-get update
 
 	echo " * Installing pkg-fso keyring"
+	diverting_invoke_rc_d   # to ensure to avoid problem from previously failed installs
+                                # to spot this separate apt-get invocation cost me about 2h
 	chroot "$INST_DIR" apt-get $APT_OPTIONS install pkg-fso-keyring
+	restoring_invoke_rc_d
 
 	echo " * Completing install of Debian basic packages to circumvent bug #542955"
 

-- 
Various non-packaged files