packages: openssh/opensshd.upstart - do not daemonize sshd, upstart is not ...

jajcus jajcus at pld-linux.org
Sun May 9 08:47:17 CEST 2010


Author: jajcus                       Date: Sun May  9 06:47:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not daemonize sshd, upstart is not able to track it properly and locks up on shutdown

---- Files affected:
packages/openssh:
   opensshd.upstart (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/openssh/opensshd.upstart
diff -u packages/openssh/opensshd.upstart:1.2 packages/openssh/opensshd.upstart:1.3
--- packages/openssh/opensshd.upstart:1.2	Fri May  7 17:53:51 2010
+++ packages/openssh/opensshd.upstart	Sun May  9 08:47:12 2010
@@ -21,8 +21,7 @@
 		OPTIONS="$OPTIONS -6"
 	fi
 
-	exec /usr/sbin/sshd $OPTIONS
+	exec /usr/sbin/sshd -D $OPTIONS
 end script
-expect daemon
 
 # vi: ft=upstart
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/opensshd.upstart?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list