From 0064194c26bafe4413fff5d78fc0140d8ffae878 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Tue, 3 Dec 2024 16:45:40 -0700
Subject: [PATCH] remove eth0 remnants

---
 config.sh | 96 -------------------------------------------------------
 1 file changed, 96 deletions(-)

diff --git a/config.sh b/config.sh
index a473a07..ad832e2 100644
--- a/config.sh
+++ b/config.sh
@@ -218,17 +218,6 @@ EOF
 blacklist nouveau
 EOL
 
-  cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-ONBOOT="yes"
-BOOTPROTO="dhcp"
-TYPE="Ethernet"
-USERCTL="no"
-PEERDNS="yes"
-IPV6INIT="no"
-PERSISTENT_DHCLIENT="1"
-EOF
-
   echo 'install_items+=" sgdisk "' > /etc/dracut.conf.d/sgdisk.conf
   echo 'add_drivers+=" xen-netfront xen-blkfront "' > /etc/dracut.conf.d/xen.conf
   #KERNEL_VERSION=$(rpm -q kernel --qf '%{V}-%{R}.%{arch}\n')
@@ -244,43 +233,11 @@ EOF
 # Generic Cloud (genclo)
 function genclo_cloud_steps() {
   echo 'genclo' > /etc/dnf/vars/infra
-  cat  >> /etc/dhcp/dhclient.conf << EOF
-timeout 300;
-retry 60;
-EOF
-
-  cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-ONBOOT="yes"
-BOOTPROTO="dhcp"
-BOOTPROTOV6="dhcp"
-TYPE="Ethernet"
-USERCTL="no"
-PEERDNS="yes"
-IPV6INIT="yes"
-PERSISTENT_DHCLIENT="1"
-EOF
 }
 
 ################################################################################
 # OCP
 function ocp_cloud_steps() {
-  cat  >> /etc/dhcp/dhclient.conf << EOF
-timeout 300;
-retry 60;
-EOF
-
-  cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-ONBOOT="yes"
-BOOTPROTO="dhcp"
-TYPE="Ethernet"
-USERCTL="no"
-PEERDNS="yes"
-IPV6INIT="no"
-PERSISTENT_DHCLIENT="1"
-EOF
-
   # OCI - Import repo GPG key
   cat <<EOF > /tmp/key
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -616,53 +573,6 @@ account   required  pam_succeed_if.so user notin root:vagrant
 EOF
 }
 
-function vbox_vagrant_steps() {
-  # legacy stuff, we won't have this for 10
-  cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-  # Install VBoxGuestAdditions for installed kernel.
-  # https://git.resf.org/sig_kernel/meta/issues/13
-  #kver=$(rpm -q --queryformat="%{VERSION}-%{RELEASE}.%{ARCH}" kernel)
-  #echo "stg/rocky" > /etc/dnf/vars/contentdir
-  #sed -i 's/^#baseurl/baseurl/g;s/^mirrorlist/#mirrorlist/g' /etc/yum.repos.d/rocky*repo
-  #dnf -y install kernel-headers-$kver kernel-devel gcc make perl elfutils-libelf-devel
-  #sed -i 's/^baseurl/#baseurl/g;s/^#mirrorlist/mirrorlist/g' /etc/yum.repos.d/rocky*repo
-  #echo "pub/rocky" > /etc/dnf/vars/contentdir
-  #curl -L -o /tmp/vboxadditions.iso https://download.virtualbox.org/virtualbox/7.0.16/VBoxGuestAdditions_7.0.16.iso
-  #mkdir -p /media/VBoxGuestAdditions
-  #mount -o loop,ro /tmp/vboxadditions.iso /media/VBoxGuestAdditions
-  #mkdir -p /tmp/VBoxGuestAdditions
-  #sh /media/VBoxGuestAdditions/VBoxLinuxAdditions.run --nox11 --noexec --keep --target /tmp/VBoxGuestAdditions
-  #pushd /tmp/VBoxGuestAdditions
-  #./install.sh
-  #/sbin/rcvboxadd quicksetup all
-  #popd
-  #ls "/lib/modules/${kver}/misc/"
-  #modinfo "/lib/modules/${kver}/misc/vboxsf.ko"
-  #rm -rf /tmp/VBoxGuestAdditions
-  #umount /media/VBoxGuestAdditions
-  #rm -f /tmp/vboxadditions.iso
-  #rmdir /media/VBoxGuestAdditions
-  #dnf -y remove kernel-devel gcc make perl elfutils-libelf-devel
-}
-
-function libvirt_vagrant_steps() {
-  # legacy stuff, we won't have this for 10
-  cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-}
-
 ################################################################################
 # SBC
 function common_sbc_steps() {
@@ -867,12 +777,6 @@ fi
 # Vagrant only
 if [[ "$kiwi_profiles" == *"Vagrant"* ]]; then
   common_vagrant_steps
-  if [[ "$kiwi_profiles" == *"Vagrant-Libvirt"* ]]; then
-    libvirt_vagrant_steps
-  fi
-  if [[ "$kiwi_profiles" == *"Vagrant-Vbox"* ]]; then
-    vbox_vagrant_steps
-  fi
 fi
 
 # SBC Only