From 6e950945da7a2acbb48fa4138208018f09d66991 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 22 May 2013 01:45:40 +0100 Subject: Switch to new unified layout for Upstart jobs as documented in https://wiki.ubuntu.com/UpstartCompatibleInitScripts: the init script checks for a running Upstart, and we now let dh_installinit handle most of the heavy lifting in maintainer scripts. Ubuntu users should be essentially unaffected except that sshd may no longer start automatically in chroots if the running Upstart predates 0.9.0; but the main goal is simply not to break when openssh-server is installed in a chroot. --- debian/openssh-server.if-up.in | 51 ------------------------------------------ 1 file changed, 51 deletions(-) delete mode 100644 debian/openssh-server.if-up.in (limited to 'debian/openssh-server.if-up.in') diff --git a/debian/openssh-server.if-up.in b/debian/openssh-server.if-up.in deleted file mode 100644 index 871493068..000000000 --- a/debian/openssh-server.if-up.in +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh -# Reload the OpenSSH server when an interface comes up, to allow it to start -# listening on new addresses. - -set -e - -# Don't bother to restart sshd when lo is configured. -if [ "$IFACE" = lo ]; then - exit 0 -fi - -# Only run from ifup. -if [ "$MODE" != start ]; then - exit 0 -fi - -# OpenSSH only cares about inet and inet6. Get ye gone, strange people -# still using ipx. -if [ "$ADDRFAM" != inet ] && [ "$ADDRFAM" != inet6 ]; then - exit 0 -fi - -# Is /usr mounted? -if [ ! -e /usr/sbin/sshd ]; then - exit 0 -fi - -if [ ! -f /var/run/sshd.pid ] || \ - [ "$(ps -p "$(cat /var/run/sshd.pid)" -o comm=)" != sshd ]; then - exit 0 -fi - -case '@DISTRIBUTOR@' in - Ubuntu) - # Both init script and Upstart job are present; we want to operate - # on the Upstart job. - stop ssh || true - start ssh || true - ;; - *) - # We'd like to use 'reload' here, but it has some problems; see - # #502444. - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d ssh restart >/dev/null 2>&1 || true - else - /etc/init.d/ssh restart >/dev/null 2>&1 || true - fi - ;; -esac - -exit 0 -- cgit v1.2.3