Change start condition of Upstart job to be just the standard "runlevel

[2345]", rather than "filesystem or runlevel [2345]"; the latter makes
it unreasonably difficult to ensure that urandom starts before ssh, and
is not really necessary since one of static-network-up and failsafe-boot
is guaranteed to happen and will trigger entry to the default runlevel,
and we don't care about ssh starting before the network (LP: #1098299).

2 files changed, 12 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 1c8490e8a..07aeeb4d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+openssh (1:6.2p2-2) UNRELEASED; urgency=low
+
+  * Change start condition of Upstart job to be just the standard "runlevel
+    [2345]", rather than "filesystem or runlevel [2345]"; the latter makes
+    it unreasonably difficult to ensure that urandom starts before ssh, and
+    is not really necessary since one of static-network-up and failsafe-boot
+    is guaranteed to happen and will trigger entry to the default runlevel,
+    and we don't care about ssh starting before the network (LP: #1098299).
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 21 May 2013 17:49:35 +0100
+
 openssh (1:6.2p2-1) unstable; urgency=low
 
   * New upstream release (http://www.openssh.com/txt/release-6.2p2):
diff --git a/debian/openssh-server.ssh.upstart b/debian/openssh-server.ssh.upstart
index d8342b9c1..21a6bc50b 100644
--- a/debian/openssh-server.ssh.upstart
+++ b/debian/openssh-server.ssh.upstart
@@ -4,7 +4,7 @@
 
 description     "OpenSSH server"
 
-start on filesystem or runlevel [2345]
+start on runlevel [2345]
 stop on runlevel [!2345]
 
 respawn