From 72083f7ba069497df8ae3ec41424854d6964b646 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@redhat.com>
Date: Mon, 15 Apr 2024 10:09:41 -0500
Subject: [PATCH] cloud: Consistent device naming

Use consistent network device names for network devices instead of
forcing the old "ethX" names from pre-2017. This ensures that
specialized network devices, such as SR-IOV devices, are easy to
recognize and configure inside a Fedora instance on a public cloud or
OpenStack cloud.

FESCo ticket: https://pagure.io/fesco/issue/3190
Change proposal: https://fedoraproject.org/wiki/Changes/EnableConsistentDeviceNamingCloud

Signed-off-by: Major Hayden <major@redhat.com>
---
 teams/cloud/cloud.xml   | 12 ++++++------
 teams/cloud/vagrant.xml |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml
index 3d6ef09..d9496d1 100644
--- a/teams/cloud/cloud.xml
+++ b/teams/cloud/cloud.xml
@@ -31,7 +31,7 @@
 	<preferences profiles="Cloud-Base-Azure" arch="x86_64,aarch64">
 		<type image="oem" format="vhd-fixed" formatoptions="force_size"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0"
 		      devicepersistency="by-uuid"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
@@ -51,7 +51,7 @@
 	<preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,aarch64">
 		<type image="oem"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
 		      devicepersistency="by-uuid"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
@@ -71,7 +71,7 @@
 	<preferences profiles="Cloud-Base-GCE" arch="x86_64,aarch64">
 		<type image="oem" format="gce"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check net.ifnames=0 console=ttyS0,38400n8d"
+		      kernelcmdline="no_timer_check console=ttyS0,38400n8d"
 		      devicepersistency="by-uuid"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
@@ -92,7 +92,7 @@
 	<preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64">
 		<type image="oem" format="qcow2"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
 		      devicepersistency="by-uuid"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
@@ -112,7 +112,7 @@
 	<preferences profiles="Cloud-Base-Generic" arch="ppc64le">
 		<type image="oem" format="qcow2"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
 		      devicepersistency="by-uuid" target_blocksize="4096"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" firmware="ofw"
 		      rootfs_label="fedora"
@@ -132,7 +132,7 @@
 	<preferences profiles="Cloud-Base-Generic" arch="s390x">
 		<type image="oem" format="qcow2"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8 dasd_mod.dasd=ipldev"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 dasd_mod.dasd=ipldev"
 		      devicepersistency="by-uuid" target_blocksize="4096"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4"
 		      rootfs_label="fedora"
diff --git a/teams/cloud/vagrant.xml b/teams/cloud/vagrant.xml
index 68789c5..ebccf93 100644
--- a/teams/cloud/vagrant.xml
+++ b/teams/cloud/vagrant.xml
@@ -13,7 +13,7 @@
 	<preferences profiles="Cloud-Base-Vagrant-libvirt" arch="x86_64,aarch64">
 		<type image="oem" format="vagrant"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
 		      devicepersistency="by-uuid"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
@@ -34,7 +34,7 @@
 	<preferences profiles="Cloud-Base-Vagrant-VirtualBox" arch="x86_64">
 		<type image="oem" format="vagrant"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
 		      devicepersistency="by-uuid"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"