diff --git a/fedora-23-i386.json b/fedora-25-i386.json similarity index 95% rename from fedora-23-i386.json rename to fedora-25-i386.json index 002aecef1..f1e854b1b 100644 --- a/fedora-23-i386.json +++ b/fedora-25-i386.json @@ -1,4 +1,3 @@ - { "builders": [ { @@ -141,9 +140,9 @@ "scripts": [ "scripts/common/metadata.sh", "scripts/fedora/fix-slow-dns.sh", - "scripts/common/sshd.sh", "scripts/fedora/build-tools.sh", "scripts/fedora/yum.sh", + "scripts/common/sshd.sh", "scripts/common/virtualbox.sh", "scripts/common/vmware.sh", "scripts/common/parallels.sh", @@ -156,7 +155,7 @@ ], "variables": { "arch": "32", - "box_basename": "fedora-23-i386", + "box_basename": "fedora-25-i386", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -164,17 +163,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "aa2125b6351480ce82ace619925d897d0588195a3287ef74fb203b6eb34cbccf", + "iso_checksum": "888ce3dd791854c8e0f62e9eac292a90cf9765a3f2de75b6ceb99eaa62d7f2cc", "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-DVD-i386-23.iso", + "iso_name": "Fedora-Server-dvd-i386-25-1.3.iso", "ks_path": "fedora-latest/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/23/Server/i386/iso", - "name": "fedora-23-i386", + "mirror_directory": "releases/25/Server/i386/iso", + "name": "fedora-25-i386", "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-23-i386", + "template": "fedora-25-i386", "version": "2.0.TIMESTAMP" } } diff --git a/fedora-23-x86_64.json b/fedora-25-x86_64.json similarity index 95% rename from fedora-23-x86_64.json rename to fedora-25-x86_64.json index 64908ce55..96f192c03 100644 --- a/fedora-23-x86_64.json +++ b/fedora-25-x86_64.json @@ -161,7 +161,7 @@ ], "variables": { "arch": "64", - "box_basename": "fedora-23", + "box_basename": "fedora-25", "build_timestamp": "{{isotime \"20060102150405\"}}", "cpus": "1", "disk_size": "40960", @@ -169,17 +169,17 @@ "headless": "", "http_proxy": "{{env `http_proxy`}}", "https_proxy": "{{env `https_proxy`}}", - "iso_checksum": "30758dc821d1530de427c9e35212bd79b058bd4282e64b7b34ae1a40c87c05ae", + "iso_checksum": "524bd959dae09ad6fc8e0476ea478700d89f82ec5795d0b1a7b873613f3f26ac", "iso_checksum_type": "sha256", - "iso_name": "Fedora-Server-DVD-x86_64-23.iso", + "iso_name": "Fedora-Server-dvd-x86_64-25-1.3.iso", "ks_path": "fedora-latest/ks.cfg", "memory": "512", "metadata": "floppy/dummy_metadata.json", "mirror": "http://download.fedoraproject.org/pub/fedora/linux", - "mirror_directory": "releases/23/Server/x86_64/iso", - "name": "fedora-23", + "mirror_directory": "releases/25/Server/x86_64/iso", + "name": "fedora-25", "no_proxy": "{{env `no_proxy`}}", - "template": "fedora-23-x86_64", + "template": "fedora-25-x86_64", "version": "2.0.TIMESTAMP" } } diff --git a/scripts/fedora/cleanup.sh b/scripts/fedora/cleanup.sh index 13f3111e2..3ab13a04b 100644 --- a/scripts/fedora/cleanup.sh +++ b/scripts/fedora/cleanup.sh @@ -1,5 +1,5 @@ #!/bin/bash -eux -yum -y remove gcc cpp kernel-devel kernel-headers perl -yum -y clean all +dnf -y remove gcc cpp kernel-devel kernel-headers perl +dnf -y clean all rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm diff --git a/scripts/fedora/fix-slow-dns.sh b/scripts/fedora/fix-slow-dns.sh index cd9ef8458..384632df3 100644 --- a/scripts/fedora/fix-slow-dns.sh +++ b/scripts/fedora/fix-slow-dns.sh @@ -1,11 +1,6 @@ #!/bin/bash -eux if [[ "$PACKER_BUILDER_TYPE" == virtualbox* ]]; then - # fix bug to enable nm-dispatcher on Fedora 19 https://bugzilla.redhat.com/show_bug.cgi?id=974811 - if [[ $(rpm -q --queryformat '%{VERSION}\n' fedora-release) == 19 ]]; then - yum -y upgrade NetworkManager - systemctl enable NetworkManager-dispatcher.service - fi ## https://access.redhat.com/site/solutions/58625 (subscription required) # add 'single-request-reopen' so it is included when /etc/resolv.conf is generated @@ -14,7 +9,7 @@ if [[ "$PACKER_BUILDER_TYPE" == virtualbox* ]]; then echo "options single-request-reopen" >> /etc/resolv.conf EOF chmod +x /etc/NetworkManager/dispatcher.d/fix-slow-dns - service NetworkManager restart + systemctl restart NetworkManager.service echo 'Slow DNS fix applied (single-request-reopen)' else echo 'Slow DNS fix not required for this platform, skipping'