From 7a50929dc031dcae40b86790ccd7a57412482ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20L=C3=BCke?= <kai@kinvolk.io>
Date: Wed, 22 Jan 2020 11:58:06 +0100
Subject: [PATCH 1/2] Revert "systemd: add module to disable network device
 renaming"

This reverts commit 6ec04c869c78f0011ce25e99d52728cca9c1bcc7.
---
 dracut/80disable-net-names/module-setup.sh | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100755 dracut/80disable-net-names/module-setup.sh

diff --git a/dracut/80disable-net-names/module-setup.sh b/dracut/80disable-net-names/module-setup.sh
deleted file mode 100755
index aa6601a..0000000
--- a/dracut/80disable-net-names/module-setup.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-depends() {
-    echo systemd
-}
-
-install() {
-    # Override the default link to disable the NamePolciy, that way
-    # device names remain untouched until the real system boots.
-    mkdir -p "$initdir/etc/systemd/network"
-    {
-        echo "[Link]"
-        echo "NamePolicy="
-        echo "MACAddressPolicy=persistent"
-    } >> "$initdir/etc/systemd/network/98-disable-net-names.link"
-}

From 88119e96e0aa5784d20d3f89836422af75adf57d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20L=C3=BCke?= <kai@kinvolk.io>
Date: Thu, 20 Feb 2020 15:14:01 +0100
Subject: [PATCH 2/2] digitalocean: Match for all interfaces

---
 dracut/03flatcar-network/yy-digitalocean-coreos.network | 2 +-
 dracut/03flatcar-network/yy-digitalocean.network        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dracut/03flatcar-network/yy-digitalocean-coreos.network b/dracut/03flatcar-network/yy-digitalocean-coreos.network
index 9b3dde7..f922906 100644
--- a/dracut/03flatcar-network/yy-digitalocean-coreos.network
+++ b/dracut/03flatcar-network/yy-digitalocean-coreos.network
@@ -1,6 +1,6 @@
 [Match]
 KernelCommandLine=coreos.oem.id=digitalocean
-Name=eth0
+Name=e*
 
 [Network]
 DHCP=yes
diff --git a/dracut/03flatcar-network/yy-digitalocean.network b/dracut/03flatcar-network/yy-digitalocean.network
index 681716e..a8c933c 100644
--- a/dracut/03flatcar-network/yy-digitalocean.network
+++ b/dracut/03flatcar-network/yy-digitalocean.network
@@ -1,6 +1,6 @@
 [Match]
 KernelCommandLine=flatcar.oem.id=digitalocean
-Name=eth0
+Name=e*
 
 [Network]
 DHCP=yes