From 5be80957001f6ffeefbf1b0e0bb3acb85d8426d0 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 24 Aug 2023 23:01:32 -0500 Subject: [PATCH] Fix up virtualbox provider --- distros/centos-stream/8/virtualbox.sh | 5 ++--- distros/centos-stream/9/virtualbox.sh | 5 ++--- distros/centos/7/finalize.sh | 2 +- distros/centos/7/virtualbox.sh | 3 +-- distros/debian/10/finalize.sh | 1 + distros/debian/11/finalize.sh | 1 + distros/debian/12/finalize.sh | 1 + distros/fedora/rawhide/x86_64.pkrvars.hcl | 4 ++-- distros/fedora/supports.yml | 4 +++- distros/ubuntu/20.04/virtualbox.sh | 5 ++--- distros/ubuntu/22.04/virtualbox.sh | 2 -- 11 files changed, 16 insertions(+), 17 deletions(-) diff --git a/distros/centos-stream/8/virtualbox.sh b/distros/centos-stream/8/virtualbox.sh index 5ec88ec..475b69d 100644 --- a/distros/centos-stream/8/virtualbox.sh +++ b/distros/centos-stream/8/virtualbox.sh @@ -1,10 +1,9 @@ #!/usr/bin/env bash set -ex -packages="bzip2 dkms kernel-devel kernel-headers make perl gcc" +packages="gcc make bzip2 kernel-devel elfutils-libelf-devel" dnf install -y ${packages} # Intentionally not quoted mount -t auto /home/vagrant/VBoxGuestAdditions.iso /mnt -/mnt/VBoxLinuxAdditions.run install 2>&1 | tee /root/vbox_addon_install.log -dnf uninstall -y ${packages} # Also intentionally not quoted +/mnt/VBoxLinuxAdditions.run install --nox11 2>&1 | tee /root/vbox_addon_install.log umount /mnt rm /home/vagrant/VBoxGuestAdditions.iso diff --git a/distros/centos-stream/9/virtualbox.sh b/distros/centos-stream/9/virtualbox.sh index 5ec88ec..5848f07 100644 --- a/distros/centos-stream/9/virtualbox.sh +++ b/distros/centos-stream/9/virtualbox.sh @@ -1,10 +1,9 @@ #!/usr/bin/env bash set -ex -packages="bzip2 dkms kernel-devel kernel-headers make perl gcc" +packages="bzip2 kernel-devel kernel-headers make perl gcc" dnf install -y ${packages} # Intentionally not quoted mount -t auto /home/vagrant/VBoxGuestAdditions.iso /mnt -/mnt/VBoxLinuxAdditions.run install 2>&1 | tee /root/vbox_addon_install.log -dnf uninstall -y ${packages} # Also intentionally not quoted +/mnt/VBoxLinuxAdditions.run install --nox11 2>&1 | tee /root/vbox_addon_install.log umount /mnt rm /home/vagrant/VBoxGuestAdditions.iso diff --git a/distros/centos/7/finalize.sh b/distros/centos/7/finalize.sh index 6ee0321..db1f019 100644 --- a/distros/centos/7/finalize.sh +++ b/distros/centos/7/finalize.sh @@ -3,6 +3,6 @@ set -ex yum -y update -yum remove make perl gcc kernel-devel kernel-headers bzip2 +yum remove -y make perl gcc kernel-devel kernel-headers bzip2 yum clean all diff --git a/distros/centos/7/virtualbox.sh b/distros/centos/7/virtualbox.sh index 2b5983f..15a3560 100644 --- a/distros/centos/7/virtualbox.sh +++ b/distros/centos/7/virtualbox.sh @@ -2,9 +2,8 @@ set -ex packages="bzip2 dkms kernel-devel kernel-headers make perl gcc" -yum install -y ${packages} # Intentionally not quoted +yum install -y ${packages} # Intentionally not quoted mount -t auto /home/vagrant/VBoxGuestAdditions.iso /mnt /mnt/VBoxLinuxAdditions.run install 2>&1 | tee /root/vbox_addon_install.log -yum uninstall -y ${packages} # Also intentionally not quoted umount /mnt rm /home/vagrant/VBoxGuestAdditions.iso diff --git a/distros/debian/10/finalize.sh b/distros/debian/10/finalize.sh index 2daf3a4..7f53e39 100644 --- a/distros/debian/10/finalize.sh +++ b/distros/debian/10/finalize.sh @@ -2,6 +2,7 @@ set -ex apt update +apt autoremove -y apt upgrade -y # Configure sshd to be faster diff --git a/distros/debian/11/finalize.sh b/distros/debian/11/finalize.sh index 52930fb..7104e91 100644 --- a/distros/debian/11/finalize.sh +++ b/distros/debian/11/finalize.sh @@ -2,6 +2,7 @@ set -ex apt update +apt autoremove -y apt upgrade -y # Configure sshd to be faster diff --git a/distros/debian/12/finalize.sh b/distros/debian/12/finalize.sh index 52930fb..7104e91 100644 --- a/distros/debian/12/finalize.sh +++ b/distros/debian/12/finalize.sh @@ -2,6 +2,7 @@ set -ex apt update +apt autoremove -y apt upgrade -y # Configure sshd to be faster diff --git a/distros/fedora/rawhide/x86_64.pkrvars.hcl b/distros/fedora/rawhide/x86_64.pkrvars.hcl index 2740f35..30d87a0 100644 --- a/distros/fedora/rawhide/x86_64.pkrvars.hcl +++ b/distros/fedora/rawhide/x86_64.pkrvars.hcl @@ -1,8 +1,8 @@ distro = "fedora" version = "rawhide" iso = { - url = "https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Server/x86_64/iso/./Fedora-Server-dvd-x86_64-Rawhide-20230823.n.0.iso" - checksum = "4ed35d456b51b2d27cfa083220cc0ac4b593f63db0513d69d79af622711783a6" + url = "https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Server/x86_64/iso/./Fedora-Server-dvd-x86_64-Rawhide-20230824.n.0.iso" + checksum = "70f626198b172da63fb991e61dd571ab2be66e2f7d0795f4c14c6c52a33f57df" } boot_command = [ "e", diff --git a/distros/fedora/supports.yml b/distros/fedora/supports.yml index c1634e4..71d0453 100644 --- a/distros/fedora/supports.yml +++ b/distros/fedora/supports.yml @@ -6,4 +6,6 @@ - arch: x86_64 provider: vmware-iso 38: *supp -rawhide: *supp +rawhide: + - arch: x86_64 + provider: qemu diff --git a/distros/ubuntu/20.04/virtualbox.sh b/distros/ubuntu/20.04/virtualbox.sh index 4bbaf0a..5a37d80 100644 --- a/distros/ubuntu/20.04/virtualbox.sh +++ b/distros/ubuntu/20.04/virtualbox.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash set -ex -apt install -y virtualbox-guest-dkms -systemctl start vboxservice -systemctl enable vboxservice +# Nothing to install here, as the package is provided by the +# kernal image in Ubuntu 20.04 diff --git a/distros/ubuntu/22.04/virtualbox.sh b/distros/ubuntu/22.04/virtualbox.sh index e438c81..2813d68 100644 --- a/distros/ubuntu/22.04/virtualbox.sh +++ b/distros/ubuntu/22.04/virtualbox.sh @@ -2,5 +2,3 @@ set -ex apt install -y virtualbox-guest-utils -systemctl start vboxservice -systemctl enable vboxservice