diff -Nru ifupdown-0.8.16ubuntu1/debian/changelog ifupdown-0.8.16ubuntu2/debian/changelog --- ifupdown-0.8.16ubuntu1/debian/changelog 2016-11-28 13:40:17.000000000 +0000 +++ ifupdown-0.8.16ubuntu2/debian/changelog 2017-08-14 17:39:29.000000000 +0000 @@ -1,3 +1,9 @@ +ifupdown (0.8.16ubuntu2) artful; urgency=medium + + * Drop obsolete upstart integration. + + -- Dimitri John Ledkov Mon, 14 Aug 2017 18:39:14 +0100 + ifupdown (0.8.16ubuntu1) zesty; urgency=medium * Merge with Debian unstable. Remaining Ubuntu changes: diff -Nru ifupdown-0.8.16ubuntu1/debian/ifupdown.maintscript ifupdown-0.8.16ubuntu2/debian/ifupdown.maintscript --- ifupdown-0.8.16ubuntu1/debian/ifupdown.maintscript 2016-11-25 11:16:17.000000000 +0000 +++ ifupdown-0.8.16ubuntu2/debian/ifupdown.maintscript 2017-08-14 17:39:01.000000000 +0000 @@ -1,3 +1,9 @@ rm_conffile /etc/default/ifupdown 0.7~+ ifupdown rm_conffile /etc/init.d/ifupdown 0.7~+ ifupdown rm_conffile /etc/init.d/ifupdown-clean 0.7~beta1 ifupdown +rm_conffile /etc/init/network-interface-container.conf 0.8.16ubuntu2~ ifupdown +rm_conffile /etc/init/network-interface-security.conf 0.8.16ubuntu2~ ifupdown +rm_conffile /etc/init/network-interface.conf 0.8.16ubuntu2~ ifupdown +rm_conffile /etc/init/networking.conf 0.8.16ubuntu2~ ifupdown +rm_conffile /etc/network/if-down.d/upstart 0.8.16ubuntu2~ ifupdown +rm_conffile /etc/network/if-up.d/upstart 0.8.16ubuntu2~ ifupdown diff -Nru ifupdown-0.8.16ubuntu1/debian/ifupdown.networking.upstart ifupdown-0.8.16ubuntu2/debian/ifupdown.networking.upstart --- ifupdown-0.8.16ubuntu1/debian/ifupdown.networking.upstart 2016-11-25 11:16:17.000000000 +0000 +++ ifupdown-0.8.16ubuntu2/debian/ifupdown.networking.upstart 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -# networking - configure virtual network devices -# -# This task causes virtual network devices that do not have an associated -# kernel object to be started on boot. - -description "configure virtual network devices" - -emits static-network-up -emits net-device-up -emits deconfiguring-networking - -start on (local-filesystems - and (stopped udevtrigger or container)) or runlevel [2345] or stopped networking RESULT=failed PROCESS=post-stop EXIT_STATUS=100 -stop on unmounted-remote-filesystems - -pre-start script - if [ "$UPSTART_EVENTS" = "stopped" ] && [ "$UPSTART_JOB" = "networking" ] && [ "$EXIT_STATUS" = "100" ]; then - exit 0 - fi - - mkdir -p /run/network - ifup -a -end script - -post-stop script - if [ -z "$UPSTART_STOP_EVENTS" ]; then - echo "Stopping or restarting the networking job is not supported." - echo "Use ifdown & ifup to reconfigure desired interface." - exit 100 - fi - - log_warning_msg() { - echo $* - } - - # These checks were taken from the Debian ifupdown.networking.init script - check_network_file_systems() { - [ -e /proc/mounts ] || return 0 - - if [ -e /etc/iscsi/iscsi.initramfs ]; then - log_warning_msg "not deconfiguring network interfaces: iSCSI root is mounted." - exit 0 - fi - - while read DEV MTPT FSTYPE REST; do - case $DEV in - /dev/nbd*|/dev/nd[a-z]*|/dev/etherd/e*) - log_warning_msg "not deconfiguring network interfaces: network devices still mounted." - exit 0 - ;; - esac - case $FSTYPE in - nfs|nfs4|smbfs|ncp|ncpfs|cifs|coda|ocfs2|gfs|pvfs|pvfs2|fuse.httpfs|fuse.curlftpfs) - log_warning_msg "not deconfiguring network interfaces: network file systems still mounted." - exit 0 - ;; - esac - done < /proc/mounts - } - - check_network_swap() { - [ -e /proc/swaps ] || return 0 - - while read DEV MTPT FSTYPE REST; do - case $DEV in - /dev/nbd*|/dev/nd[a-z]*|/dev/etherd/e*) - log_warning_msg "not deconfiguring network interfaces: network swap still mounted." - exit 0 - ;; - esac - done < /proc/swaps - } - - check_network_file_systems - check_network_swap - - # Anything that manages network interfaces *MUST* wait for this event - initctl emit deconfiguring-networking - ifdown -a --exclude=lo -end script diff -Nru ifupdown-0.8.16ubuntu1/debian/ifupdown.network-interface-container.upstart ifupdown-0.8.16ubuntu2/debian/ifupdown.network-interface-container.upstart --- ifupdown-0.8.16ubuntu1/debian/ifupdown.network-interface-container.upstart 2016-11-25 11:16:17.000000000 +0000 +++ ifupdown-0.8.16ubuntu2/debian/ifupdown.network-interface-container.upstart 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -# network-interface-container - woarkound for missing events in container -# -# This service emits missing net-device-added events for containers. -# It's needed in cases where devices are created before the container -# starts and so won't get a udev event. - -description "workaround for missing events in container" -start on container - -emits net-device-added - -task -script - case "$CONTAINER" in - lxc|lxc-libvirt|openvz) - initctl emit --no-wait net-device-added INTERFACE=lo || true - ;; - esac -end script diff -Nru ifupdown-0.8.16ubuntu1/debian/ifupdown.network-interface-security.upstart ifupdown-0.8.16ubuntu2/debian/ifupdown.network-interface-security.upstart --- ifupdown-0.8.16ubuntu1/debian/ifupdown.network-interface-security.upstart 2016-11-25 11:16:17.000000000 +0000 +++ ifupdown-0.8.16ubuntu2/debian/ifupdown.network-interface-security.upstart 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -# network-interface-security - configure network device security -# -# This is a one-time start-up script to load AppArmor profiles needed -# before the network comes up. - -description "configure network device security" - -# In order to avoid upstart bug LP: #447654, we cannot have an AND -# statement here (with the ORs). An "and virtual-filesystems" is desired -# here to make sure that the securityfs is mounted, but since each of the -# ORed services already require virtual-filesystems be mounted, this is safe: -start on (starting network-interface - or starting network-manager - or starting networking) -stop on (stopped network-interface JOB=$JOB INTERFACE=$INTERFACE - or stopped network-manager JOB=$JOB - or stopped networking JOB=$JOB) - -# In order to handle the lack of upstart feature LP: #568860, we need to -# run multiple times, for each of the above "starting" service instances, or -# else another one might run while we're running, and not wait for us to -# finish. -instance $JOB${INTERFACE:+/}${INTERFACE:-} - -# Since we need these profiles to be loaded before any of the above services -# begin running, this service must be a pre-start so that its pre-start -# script finishes before the above services' start scripts begin. -pre-start script - [ -f /run/network-interface-security ] && exit 0 # already ran - [ -d /rofs/etc/apparmor.d ] && exit 0 # do not load on liveCD - [ -d /sys/module/apparmor ] || exit 0 # do not load without AppArmor - [ -x /sbin/apparmor_parser ] || exit 0 # do not load without parser - for link in /etc/apparmor/init/network-interface-security/* ; do - [ -L $link ] && /sbin/apparmor_parser -r -W $link || true - done - > /run/network-interface-security -end script diff -Nru ifupdown-0.8.16ubuntu1/debian/ifupdown.network-interface.upstart ifupdown-0.8.16ubuntu2/debian/ifupdown.network-interface.upstart --- ifupdown-0.8.16ubuntu1/debian/ifupdown.network-interface.upstart 2016-11-25 11:16:17.000000000 +0000 +++ ifupdown-0.8.16ubuntu2/debian/ifupdown.network-interface.upstart 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -# network-interface - configure network device -# -# This service causes network devices to be brought up or down as a result -# of hardware being added or removed, including that which isn't ordinarily -# removable. - -description "configure network device" - -emits net-device-up -emits net-device-down -emits static-network-up - -start on net-device-added -stop on net-device-removed INTERFACE=$INTERFACE - -instance $INTERFACE -export INTERFACE - -pre-start script - if [ "$INTERFACE" = lo ]; then - # bring this up even if /etc/network/interfaces is broken - ifconfig lo 127.0.0.1 up || true - initctl emit -n net-device-up \ - IFACE=lo LOGICAL=lo ADDRFAM=inet METHOD=loopback || true - fi - mkdir -p /run/network - ifup --allow auto $INTERFACE - ifup --allow hotplug $INTERFACE -end script - -post-stop script - ifdown --force --allow auto $INTERFACE - ifdown --force --allow hotplug $INTERFACE -end script diff -Nru ifupdown-0.8.16ubuntu1/debian/ifupdown.upstart.if-down ifupdown-0.8.16ubuntu2/debian/ifupdown.upstart.if-down --- ifupdown-0.8.16ubuntu1/debian/ifupdown.upstart.if-down 2016-11-25 11:16:17.000000000 +0000 +++ ifupdown-0.8.16ubuntu2/debian/ifupdown.upstart.if-down 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/sh -e - -if [ -e /lib/lsb/init-functions ]; then - . /lib/lsb/init-functions -fi - -if ! init_is_upstart; then - exit 0 -fi - -# Let's ignore meta entries (ifdown -a) -if [ "$ADDRFAM" = "meta" ]; then - exit 0 -fi - -initctl emit -n net-device-down \ - "IFACE=$IFACE" \ - "LOGICAL=$LOGICAL" \ - "ADDRFAM=$ADDRFAM" \ - "METHOD=$METHOD" diff -Nru ifupdown-0.8.16ubuntu1/debian/ifupdown.upstart.if-up ifupdown-0.8.16ubuntu2/debian/ifupdown.upstart.if-up --- ifupdown-0.8.16ubuntu1/debian/ifupdown.upstart.if-up 2016-11-25 11:16:17.000000000 +0000 +++ ifupdown-0.8.16ubuntu2/debian/ifupdown.upstart.if-up 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -#!/bin/sh -e -MARK_DEV_PREFIX="/run/network/ifup." -MARK_STATIC_NETWORK_EMITTED="/run/network/static-network-up-emitted" - -if [ -e /lib/lsb/init-functions ]; then - . /lib/lsb/init-functions -fi - -if ! init_is_upstart; then - exit 0 -fi - -# Let's ignore meta entries (ifup -a) -if [ "$ADDRFAM" = "meta" ]; then - exit 0 -fi - -# lo emission handled by /etc/init/network-interface.conf -if [ "$IFACE" != lo ]; then - initctl emit -n net-device-up \ - "IFACE=$IFACE" \ - "LOGICAL=$LOGICAL" \ - "ADDRFAM=$ADDRFAM" \ - "METHOD=$METHOD" -fi - -get_auto_interfaces() { - # write to stdout a list of interfaces configured as 'auto' in interfaces(5) - local found="" - # stderr redirected as it outputs things like: - # Ignoring unknown interface eth0=eth0. - found=$(ifquery --list --allow auto 2>/dev/null) || return - set -- ${found} - echo "$@" -} - -all_interfaces_up() { - # return true if all interfaces listed in /etc/network/interfaces as 'auto' - # are up. if no interfaces are found there, then "all [given] were up" - local prefix="$1" iface="" - for iface in $(get_auto_interfaces); do - # if cur interface does is not up, then all have not been brought up - [ -f "${prefix}${iface}" ] || return 1 - done - return 0 -} - -# touch our own "marker" indicating that this interface has been brought up. -: > "${MARK_DEV_PREFIX}$IFACE" - -if all_interfaces_up "${MARK_DEV_PREFIX}" && - mkdir "${MARK_STATIC_NETWORK_EMITTED}" 2>/dev/null; then - initctl emit --no-wait static-network-up -fi diff -Nru ifupdown-0.8.16ubuntu1/debian/rules ifupdown-0.8.16ubuntu2/debian/rules --- ifupdown-0.8.16ubuntu1/debian/rules 2016-11-25 11:16:17.000000000 +0000 +++ ifupdown-0.8.16ubuntu2/debian/rules 2017-08-14 17:39:11.000000000 +0000 @@ -25,9 +25,6 @@ dh_installinit --name=networking --noscripts dh_installinit --name=ifup@ --noscripts -override_dh_installifupdown: - dh_installifupdown --name=upstart - override_dh_auto_clean: $(MAKE) clean