2006-11-29 21:08:50 by steve

Use the new start-stop-daemon code when installing packages.

hooks/common.sh

@@ -74,11 +74,21 @@ installDebianPackage ()
     #
     assert "$LINENO" -d ${prefix}
 
+    #
+    # Disable the start-stop-daemon
+    #
+    disableStartStopDaemon
+
     #
     # Install the package
     #
     DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-yes install ${package}
 
+    #
+    # Re-enable the start-stop-daemon
+    #
+    enableStartStopDaemon
+
 }
 
 
@@ -102,6 +112,8 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" >
    logMessage "Start Stop Daemon disabled off."
 }
  
+
+
 #
 # Enable the start-stop-daemon
 #

hooks/dapper/70-install-ssh

@@ -35,12 +35,6 @@ logMessage Script $0 starting
 installDebianPackage ${prefix} ssh
 
 
-#
-#  Make sure sshd isn't running, this will cause our unmounting of the
-# disk image to fail..
-#
-chroot ${prefix} /etc/init.d/ssh stop
-
 
 #
 #  Log our finish

hooks/debian/70-install-ssh

@@ -35,13 +35,6 @@ logMessage Script $0 starting
 installDebianPackage ${prefix} ssh
 
 
-#
-#  Make sure sshd isn't running, this will cause our unmounting of the
-# disk image to fail..
-#
-chroot ${prefix} /etc/init.d/ssh stop
-
-
 #
 #  Log our finish
 #

hooks/edgy/70-install-ssh

@@ -35,12 +35,6 @@ logMessage Script $0 starting
 installDebianPackage ${prefix} ssh
 
 
-#
-#  Make sure sshd isn't running, this will cause our unmounting of the
-# disk image to fail..
-#
-chroot ${prefix} /etc/init.d/ssh stop
-
 
 #
 #  Log our finish