ubuntu: Fix openssh postinst call in >= saucy

The new openssh uses a different mechanism to start/stop the daemon which in turn requires a few tweaks in our template to deal with both the new and old ways of doing that. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

ubuntu: Fix openssh postinst call in >= saucy
6cda3f5a · Stéphane Graber · b58e60e2 · 6cda3f5a
Unverified Commit 6cda3f5a authored Jul 08, 2013 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

lxc-ubuntu.in templates/lxc-ubuntu.in +9 -1

No files found.
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -91,10 +91,18 @@ EOF

    # generate new SSH keys
    if [ -x $rootfs@LOCALSTATEDIR@/lib/dpkg/info/openssh-server.postinst ]; then
+        cat > $rootfs/usr/sbin/policy-rc.d << EOF
+#!/bin/sh
+exit 101
+EOF
+        chmod +x $rootfs/usr/sbin/policy-rc.d
+
        rm -f $rootfs/etc/ssh/ssh_host_*key*
        mv $rootfs/etc/init/ssh.conf $rootfs/etc/init/ssh.conf.disabled
-        chroot $rootfs @LOCALSTATEDIR@/lib/dpkg/info/openssh-server.postinst configure
+        DPKG_MAINTSCRIPT_PACKAGE=openssh DPKG_MAINTSCRIPT_NAME=postinst chroot $rootfs @LOCALSTATEDIR@/lib/dpkg/info/openssh-server.postinst configure
        mv $rootfs/etc/init/ssh.conf.disabled $rootfs/etc/init/ssh.conf
+
+        rm -f $rootfs/usr/sbin/policy-rc.d
    fi

    return 0