Merge branch 'main' of github.com:chef/bento

* 'main' of github.com:chef/bento:
  feat: remove fedora 37 and add fedora 39 (chef#1535)
  rhel: Check for networking-scripts before removal (chef#1532)

.github/workflows/pkr-bld-hyperv-x64.yml

@@ -19,8 +19,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-37
           - fedora-38
+          - fedora-39
           - freebsd-12
           - freebsd-13
           - opensuse-leap-15

.github/workflows/pkr-bld-parallels-arm64.yml

@@ -19,8 +19,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-37
           - fedora-38
+          - fedora-39
           - freebsd-12
           - freebsd-13
           - opensuse-leap-15

.github/workflows/pkr-bld-parallels-x64.yml

@@ -19,8 +19,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-37
           - fedora-38
+          - fedora-39
           - freebsd-12
           - freebsd-13
           - opensuse-leap-15

.github/workflows/pkr-bld-qemu-arm64.yml

@@ -19,8 +19,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-37
           - fedora-38
+          - fedora-39
           - freebsd-12
           - freebsd-13
           - opensuse-leap-15

.github/workflows/pkr-bld-qemu-x64.yml

@@ -19,8 +19,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-37
           - fedora-38
+          - fedora-39
           - freebsd-12
           - freebsd-13
           - opensuse-leap-15

.github/workflows/pkr-bld-virtualbox-arm64.yml

@@ -19,8 +19,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-37
           - fedora-38
+          - fedora-39
           - freebsd-12
           - freebsd-13
           - opensuse-leap-15

.github/workflows/pkr-bld-virtualbox-x64.yml

@@ -19,8 +19,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-37
           - fedora-38
+          - fedora-39
           - freebsd-12
           - freebsd-13
           - opensuse-leap-15

.github/workflows/pkr-bld-vmware-arm64.yml

@@ -19,8 +19,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-37
           - fedora-38
+          - fedora-39
           - freebsd-12
           - freebsd-13
           - opensuse-leap-15

.github/workflows/pkr-bld-vmware-x64.yml

@@ -19,8 +19,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-37
           - fedora-38
+          - fedora-39
           - freebsd-12
           - freebsd-13
           - opensuse-leap-15

README.md

@@ -126,7 +126,7 @@ To use an alternate url
 ````bash
 cd <path/to>/bento
 packer init -upgrade ./packer_templates
-packer build -var 'iso_url=http://mirror.utexas.edu/fedora/linux' -var-file=os_pkrvars/fedora/fedor-37-x86_64.pkrvars.hcl ./packer_templates
+packer build -var 'iso_url=https://mirrors.rit.edu/fedora/fedora/linux/releases/39/Server/x86_64/iso/Fedora-Server-dvd-x86_64-39-1.5.iso' -var-file=os_pkrvars/fedora/fedora-39-x86_64.pkrvars.hcl ./packer_templates
 ````
 
 If the build is successful, your box files will be in the `builds` directory at the root of the repository.

builds.yml

@@ -11,8 +11,8 @@ public:
   - 'centos-stream-9'
   - 'debian-11'
   - 'debian-12'
-  - 'fedora-37'
   - 'fedora-38'
+  - 'fedora-39'
   - 'freebsd-12'
   - 'freebsd-13'
   - 'opensuse-leap-15'
@@ -37,8 +37,8 @@ public:
   - 'centos-stream-9-arm64'
   - 'debian-11-arm64'
   - 'debian-12-arm64'
-  - 'fedora-37-arm64'
   - 'fedora-38-arm64'
+  - 'fedora-39-arm64'
   - 'freebsd-12-arm64'
   - 'freebsd-13-arm64'
   - 'opensuse-leap-15-arm64'

os_pkrvars/fedora/fedora-37-aarch64.pkrvars.hcl → os_pkrvars/fedora/fedora-39-aarch64.pkrvars.hcl

@@ -1,9 +1,10 @@
+
 os_name                 = "fedora"
-os_version              = "37"
+os_version              = "39"
 os_arch                 = "aarch64"
-iso_url                 = "https://download.fedoraproject.org/pub/fedora/linux/releases/37/Server/aarch64/iso/Fedora-Server-dvd-aarch64-37-1.7.iso"
-iso_checksum            = "sha256:1c2deba876bd2da3a429b1b0cd5e294508b8379b299913d97dd6dd6ebcd8b56f"
+iso_url                 = "https://mirrors.rit.edu/fedora/fedora/linux/releases/39/Server/aarch64/iso/Fedora-Server-dvd-aarch64-39-1.5.iso"
+iso_checksum            = "sha256:d19dc2a39758155fa53e6fd555d0d173ccc8175b55dea48002d499f39cb30ce0"
 parallels_guest_os_type = "fedora-core"
 vbox_guest_os_type      = "Fedora_64"
 vmware_guest_os_type    = "arm-fedora-64"
-boot_command            = ["<wait><up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"]
+boot_command            = ["<wait><up><up>e<wait><down><down><end> inst.text inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/fedora/ks.cfg<F10><wait>"]

os_pkrvars/fedora/fedora-37-x86_64.pkrvars.hcl → os_pkrvars/fedora/fedora-39-x86_64.pkrvars.hcl

@@ -1,8 +1,8 @@
 os_name                 = "fedora"
-os_version              = "37"
+os_version              = "39"
 os_arch                 = "x86_64"
-iso_url                 = "https://download.fedoraproject.org/pub/fedora/linux/releases/37/Server/x86_64/iso/Fedora-Server-dvd-x86_64-37-1.7.iso"
-iso_checksum            = "sha256:0a4de5157af47b41a07a53726cd62ffabd04d5c1a4afece5ee7c7a84c1213e4f"
+iso_url                 = "https://mirrors.rit.edu/fedora/fedora/linux/releases/39/Server/x86_64/iso/Fedora-Server-dvd-x86_64-39-1.5.iso"
+iso_checksum            = "sha256:2755cdff6ac6365c75be60334bf1935ade838fc18de53d4c640a13d3e904f6e9"
 parallels_guest_os_type = "fedora-core"
 vbox_guest_os_type      = "Fedora_64"
 vmware_guest_os_type    = "fedora-64"

packer_templates/scripts/rhel/cleanup_dnf.sh

@@ -31,12 +31,14 @@ mkdir -p /etc/udev/rules.d/70-persistent-net.rules;
 rm -f /lib/udev/rules.d/75-persistent-net-generator.rules;
 rm -rf /dev/.udev/;
 
-for ndev in /etc/sysconfig/network-scripts/ifcfg-*; do
-    if [ "$(basename "$ndev")" != "ifcfg-lo" ]; then
-        sed -i '/^HWADDR/d' "$ndev";
-        sed -i '/^UUID/d' "$ndev";
-    fi
-done
+if test -f /etc/sysconfig/network-scripts/ifcfg-*; then
+    for ndev in /etc/sysconfig/network-scripts/ifcfg-*; do
+        if [ "$(basename "$ndev")" != "ifcfg-lo" ]; then
+            sed -i '/^HWADDR/d' "$ndev";
+            sed -i '/^UUID/d' "$ndev";
+        fi
+    done
+fi
 
 echo "truncate any logs that have built up during the install"
 find /var/log -type f -exec truncate --size=0 {} \;

packer_templates/scripts/rhel/cleanup_yum.sh

@@ -31,13 +31,14 @@ mkdir -p /etc/udev/rules.d/70-persistent-net.rules;
 rm -f /lib/udev/rules.d/75-persistent-net-generator.rules;
 rm -rf /dev/.udev/;
 
-for ndev in /etc/sysconfig/network-scripts/ifcfg-*; do
-    if [ "$(basename "$ndev")" != "ifcfg-lo" ]; then
-        sed -i '/^HWADDR/d' "$ndev";
-        sed -i '/^UUID/d' "$ndev";
-    fi
-done
+if test -f /etc/sysconfig/network-scripts/ifcfg-*; then
+    for ndev in /etc/sysconfig/network-scripts/ifcfg-*; do
+        if [ "$(basename "$ndev")" != "ifcfg-lo" ]; then
 
+            sed -i '/^UUID/d' "$ndev";
+        fi
+    done
+fi
 echo "truncate any logs that have built up during the install"
 find /var/log -type f -exec truncate --size=0 {} \;