From c64a446ad63379cd011cea1b57ecf370fca3fbdd Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Thu, 6 Aug 2015 16:31:07 -0700
Subject: [PATCH] coreos-base/oem-rackspace-onmetal: fix race

Rather than doing this crazy rename during boot, just use the GRUB
config to pass net.ifnames=0 to the kernel.
---
 .../files/cloud-config.yml                    | 29 +------------------
 .../oem-rackspace-onmetal/files/grub.cfg      |  2 +-
 .../oem-rackspace-onmetal/files/netname.sh    |  4 ---
 .../files/rename-interfaces.sh                |  7 -----
 ...ild => oem-rackspace-onmetal-0.0.7.ebuild} |  0
 5 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/netname.sh
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/rename-interfaces.sh
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/{oem-rackspace-onmetal-0.0.6.ebuild => oem-rackspace-onmetal-0.0.7.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml
index 5b805e12b7..e661162c06 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml
@@ -1,19 +1,5 @@
 #cloud-config
 
-write_files:
-  - path: /run/udev/rules.d/79-netname.rules
-    permissions: 444
-    content: |
-      SUBSYSTEM!="net", GOTO="netname_end"
-      ACTION!="add", GOTO="netname_end"
-      ENV{ID_BUS}!="pci", GOTO="netname_end"
-
-      IMPORT{program}="/usr/share/oem/bin/netname.sh $env{IFINDEX}"
-
-      NAME=="", ENV{ID_NET_NAME_SIMPLE}!="", NAME="$env{ID_NET_NAME_SIMPLE}"
-
-      LABEL="netname_end"
-
 coreos:
     units:
       - name: user-configdrive.service.d/netconf.conf
@@ -36,19 +22,6 @@ coreos:
 
           [Install]
           WantedBy=user-config.target
-      - name: rename-network-interfaces.service
-        command: start
-        runtime: yes
-        content: |
-          [Unit]
-          Before=user-config.target
-
-          [Service]
-          Type=oneshot
-          RemainAfterExit=yes
-          ExecStart=/usr/bin/systemctl stop systemd-networkd
-          ExecStart=/usr/share/oem/bin/rename-interfaces.sh
-          ExecStart=/usr/bin/systemctl start systemd-networkd
       - name: media-configdrive.mount
         command: start
         runtime: yes
@@ -63,7 +36,7 @@ coreos:
           Options=ro
     oem:
       id: onmetal
-      name: Rackspace Teeth
+      name: Rackspace OnMetal
       version-id: @@OEM_VERSION_ID@@
       home-url: http://www.rackspace.com/
       bug-report-url: https://github.com/coreos/bugs/issues
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/grub.cfg
index a63b8dcd54..8542fd65e2 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/grub.cfg
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/grub.cfg
@@ -8,4 +8,4 @@ set timeout=15
 set linux_console="console=ttyS4,115200n8 8250.nr_uarts=5"
 
 # Blacklist MEI, the firmware is just plain broken.
-set linux_append="modprobe.blacklist=mei_me"
+set linux_append="modprobe.blacklist=mei_me net.ifnames=0"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/netname.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/netname.sh
deleted file mode 100644
index 74e18ff757..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/netname.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/bash
-
-IFINDEX=$1
-echo "ID_NET_NAME_SIMPLE=eth$((${IFINDEX} - 2))"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/rename-interfaces.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/rename-interfaces.sh
deleted file mode 100644
index 9b96c3222b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/rename-interfaces.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/bash
-
-INTERFACES=$(ip link show | gawk -F ':' '/^[0-9]+/ { print $2 }' | tr -d ' ' | sed 's/lo//')
-for iface in ${INTERFACES}; do
-	ip link set ${iface} down
-	udevadm test /sys/class/net/${iface}
-done
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.6.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.7.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.6.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.7.ebuild