From 27000b8fa531efdd989ed6c93e717980357d2fda Mon Sep 17 00:00:00 2001 From: Scott Burns Date: Thu, 2 Feb 2017 23:16:05 -0800 Subject: [PATCH] coreos-overlay/oem-packet: Remove bond workaround Now that Packet uses Ignition to configure systemd-networkd units before systemd-networkd starts, the workaround described in the below issue is no longer necessary: https://github.com/coreos/bugs/issues/36 --- .../coreos-base/oem-packet/files/cloud-config.yml | 10 ---------- .../coreos-base/oem-packet/files/reset-interfaces.sh | 8 -------- ...oem-packet-0.0.3.ebuild => oem-packet-0.0.5.ebuild} | 1 - 3 files changed, 19 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/reset-interfaces.sh rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/{oem-packet-0.0.3.ebuild => oem-packet-0.0.5.ebuild} (93%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/cloud-config.yml index 934f015e44..332bb7fc80 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/cloud-config.yml @@ -2,22 +2,12 @@ coreos: units: - - name: oem-reset-interfaces.service - command: start - content: | - [Unit] - Description=Reset the bond. - [Service] - Type=oneshot - ExecStart=/usr/share/oem/bin/reset-interfaces.sh - name: oem-cloudinit.service command: restart runtime: yes content: | [Unit] Description=Cloudinit from Packet metadata - After=oem-reset-interfaces.service - Requires=oem-reset-interfaces.service [Service] Type=oneshot diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/reset-interfaces.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/reset-interfaces.sh deleted file mode 100644 index b00eb9c092..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/files/reset-interfaces.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e -logger "Hard reset of all network interfaces due to upstream systemd-networkd issue: https://github.com/coreos/bugs/issues/36 ." -for iface in `ls -1 /sys/class/net | egrep -v "(^lo$|^bond)"`; do - ip link set $iface down -done -ip link del bond0 -systemctl restart systemd-networkd diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.5.ebuild similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.5.ebuild index 4f5b9e8cb4..5d748ee1dc 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-packet/oem-packet-0.0.5.ebuild @@ -22,7 +22,6 @@ src_prepare() { src_install() { into "/usr/share/oem" dobin "${FILESDIR}/phone-home.sh" - dobin "${FILESDIR}/reset-interfaces.sh" insinto "/usr/share/oem" doins "${T}/cloud-config.yml"