github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8930 from AkihiroSuda/rocky8.8

Browse Source
This commit is contained in:
Fu Wei 2023-08-14 20:44:20 +08:00 committed by GitHub
commit 36b871955c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View File

@ -531,8 +531,7 @@ jobs:
matrix: matrix:
box: box:
- fedora/38-cloud-base - fedora/38-cloud-base
# v7.0.0 does not boot. v6.0.0 was not released. - rockylinux/8@8.0.0
- rockylinux/8@5.0.0
env: env:
BOX: ${{ matrix.box }} BOX: ${{ matrix.box }}

2
Vagrantfile vendored
View File

@ -29,11 +29,13 @@ Vagrant.configure("2") do |config|
v.cpus = cpus v.cpus = cpus
# Needs env var VAGRANT_EXPERIMENTAL="disks" # Needs env var VAGRANT_EXPERIMENTAL="disks"
o.vm.disk :disk, size: "#{disk_size}GB", primary: true o.vm.disk :disk, size: "#{disk_size}GB", primary: true
v.customize ["modifyvm", :id, "--firmware", "efi"]
end end
config.vm.provider :libvirt do |v| config.vm.provider :libvirt do |v|
v.memory = memory v.memory = memory
v.cpus = cpus v.cpus = cpus
v.machine_virtual_size = disk_size v.machine_virtual_size = disk_size
v.loader = "/usr/share/OVMF/OVMF_CODE.fd"
end end
config.vm.synced_folder ".", "/vagrant", type: "rsync" config.vm.synced_folder ".", "/vagrant", type: "rsync"

2
script/resize-vagrant-root.sh
View File

@ -34,6 +34,8 @@ if [[ "$df_line" =~ ^/dev/([a-z]+)([0-9+]) ]]; then
echo "Unknown filesystem: $df_line" echo "Unknown filesystem: $df_line"
exit 1 exit 1
fi fi
elif [[ "$df_line" =~ ^/dev/mapper/ ]]; then
echo "TODO: support device mapper: $df_line"
else else
echo "Failed to parse: $df_line" echo "Failed to parse: $df_line"
exit 1 exit 1