diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile index dbbb1f07c..00b407d50 100644 --- a/scripts/vagrant/Vagrantfile +++ b/scripts/vagrant/Vagrantfile @@ -13,9 +13,9 @@ def get_box_type(distro, force_distro) 'ubuntu1604' => 'peru/ubuntu-16.04-server-amd64', 'ubuntu1804' => 'peru/ubuntu-18.04-server-amd64', 'ubuntu2004' => 'peru/ubuntu-20.04-server-amd64', - 'fedora32' => 'generic/fedora32', 'fedora33' => 'generic/fedora33', 'fedora34' => 'fedora/34-cloud-base', + # Placeholder for F35, no generic image on Vagrant Cloud yet 'arch' => 'generic/arch', 'freebsd12' => 'generic/freebsd12', } diff --git a/scripts/vagrant/create_vbox.sh b/scripts/vagrant/create_vbox.sh index 999ed88ae..7635e3ea0 100755 --- a/scripts/vagrant/create_vbox.sh +++ b/scripts/vagrant/create_vbox.sh @@ -19,8 +19,8 @@ display_help() { echo echo " Usage: ${0##*/} [-b nvme-backing-file] [-n ] [-s ] [-x ] [-hvrldcuf] " echo - echo " distro = " + echo " distro = " echo echo " -s in MB Default: ${SPDK_VAGRANT_VMRAM}" echo " -n 1 to 4 Default: ${SPDK_VAGRANT_VMCPU}" @@ -169,7 +169,7 @@ SPDK_VAGRANT_DISTRO="$*" case "${SPDK_VAGRANT_DISTRO}" in centos[78]) ;& ubuntu1[68]04 | ubuntu2004) ;& - fedora3[2-4]) ;& + fedora3[3-5]) ;& freebsd1[12]) ;& arch | clearlinux) ;; *)