From 90443f038d7bb2b4b7ad982c25dccd5ca01e4af2 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 8 Aug 2023 04:49:38 +0900 Subject: [PATCH] CI: update Rocky Linux to 8.8 - UEFI now has to be enabled - The root device is now `/dev/mapper/rocky-root` Signed-off-by: Akihiro Suda --- .github/workflows/ci.yml | 3 +-- Vagrantfile | 2 ++ script/resize-vagrant-root.sh | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f35a9701..f98f0afed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -531,8 +531,7 @@ jobs: matrix: box: - fedora/38-cloud-base - # v7.0.0 does not boot. v6.0.0 was not released. - - rockylinux/8@5.0.0 + - rockylinux/8@8.0.0 env: BOX: ${{ matrix.box }} diff --git a/Vagrantfile b/Vagrantfile index b8e53ca70..d90f352ba 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -29,11 +29,13 @@ Vagrant.configure("2") do |config| v.cpus = cpus # Needs env var VAGRANT_EXPERIMENTAL="disks" o.vm.disk :disk, size: "#{disk_size}GB", primary: true + v.customize ["modifyvm", :id, "--firmware", "efi"] end config.vm.provider :libvirt do |v| v.memory = memory v.cpus = cpus v.machine_virtual_size = disk_size + v.loader = "/usr/share/OVMF/OVMF_CODE.fd" end config.vm.synced_folder ".", "/vagrant", type: "rsync" diff --git a/script/resize-vagrant-root.sh b/script/resize-vagrant-root.sh index ba9afcd18..1da8681cc 100755 --- a/script/resize-vagrant-root.sh +++ b/script/resize-vagrant-root.sh @@ -34,6 +34,8 @@ if [[ "$df_line" =~ ^/dev/([a-z]+)([0-9+]) ]]; then echo "Unknown filesystem: $df_line" exit 1 fi +elif [[ "$df_line" =~ ^/dev/mapper/ ]]; then + echo "TODO: support device mapper: $df_line" else echo "Failed to parse: $df_line" exit 1