From: Stéphane Graber Date: Mon, 8 Jul 2013 17:02:52 +0000 (-0400) Subject: ubuntu: Fix openssh postinst call in >= saucy X-Git-Tag: lxc-1.0.0.alpha1~1^2~135 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cda3f5ac1e3a20a97a419923e587d6bdb1fece9;p=thirdparty%2Flxc.git 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 Acked-by: Serge E. Hallyn --- diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in index 1623b750b..b6ae501e5 100644 --- 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