Merge lp:~clint-fewbar/ubuntu/natty/openssh/runlevel-fix into lp:ubuntu/natty/openssh

[Clint Byrum]

Simple fix to make sure ssh is started again when entering runlevel 2

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-03 16:20:29 +0000
+++ debian/changelog	2011-04-01 23:12:27 +0000
@@ -1,3 +1,10 @@
+openssh (1:5.8p1-1ubuntu3) natty; urgency=low
+
+  * Start on runlevel [2345] so that switching back to runlevel 2
+    from single user mode starts ssh again. (LP: #747756)
+
+ -- Clint Byrum <[e-mail]>  Fri, 01 Apr 2011 16:05:43 -0700
+
 openssh (1:5.8p1-1ubuntu2) natty; urgency=low
 
   [ Clint Byrum ]

=== modified file 'debian/openssh-server.ssh.upstart'
--- debian/openssh-server.ssh.upstart	2010-12-13 22:06:37 +0000
+++ debian/openssh-server.ssh.upstart	2011-04-01 23:12:27 +0000
@@ -4,7 +4,7 @@
 
 description	"OpenSSH server"
 
-start on filesystem
+start on filesystem or runlevel [2345]
 stop on runlevel [!2345]
 
 respawn