Merge lp:~clint-fewbar/ubuntu/natty/openssh/init.d-chroot-aware into lp:ubuntu/natty/openssh

[Clint Byrum]

This copies code from initramfs-tools per cjwatson's suggestion to test whether or not the init.d script is running chrooted. If it is not chrooted, then we just exec /lib/init/upstart-job, making it work much the same way as if /etc/init.d/ssh were symlinked.

[Scott Moser (smoser)]

I suspect that it does not matter, but I'm fairly sure that the check given there would fail if inside a container rather than a chroot. (container's /proc/1 probably isn't /sbin/init).

I suspect that this is fine, and even intended as likely/possibly inside a container they would have their own ssh.

[Evan Broder (broder)]

This patch looks good to me.

But...it looks like Upstart just landed chroot support. Does that mean that we can just completely replace /etc/init.d/ssh with a symlink to /lib/init/upstart-job now? Do we want to do that instead of this patch?

[Colin Watson (cjwatson)]

Chroot support doesn't quite work yet IME. I still want to land this
patch in the meantime.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-27 12:22:49 +0000
+++ debian/changelog	2011-01-31 22:22:12 +0000
@@ -1,3 +1,12 @@
+openssh (1:5.7p1-2ubuntu2) natty; urgency=low
+
+  * debian/openssh-server.ssh.init: Adding upstart awareness that will
+    call /lib/init/upstart-job when script is run outside of a chroot.
+    While this fixes LP: #531912 , the change should be reverted when
+    upstart gains chroot session support.
+
+ -- Clint Byrum <[e-mail]>  Mon, 31 Jan 2011 14:06:56 -0800
+
 openssh (1:5.7p1-2ubuntu1) natty; urgency=low
 
   * Resynchronise with Debian experimental.  Remaining changes:

=== modified file 'debian/openssh-server.ssh.init'
--- debian/openssh-server.ssh.init	2010-04-16 09:59:45 +0000
+++ debian/openssh-server.ssh.init	2011-01-31 22:22:12 +0000
@@ -16,6 +16,23 @@
 test -x /usr/sbin/sshd || exit 0
 ( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0
 
+chrooted() {
+	# borrowed from udev's postinst
+	# and then borrowed from initramfs-tools's preinst
+	if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ]; then
+		# the devicenumber/inode pair of / is the same as that of
+		# /sbin/init's root, so we're *not* in a chroot and hence
+		# return false.
+		return 1
+	fi
+	return 0
+}
+
+# The init.d script is only for chroots
+if ! chrooted ; then
+  exec /lib/init/upstart-job ssh $@
+fi
+
 umask 022
 
 if test -f /etc/default/ssh; then