From 099bdaf3b5279bca62858c8e68e3d0cd331cb9ad Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Fri, 21 Oct 2022 15:05:22 +0200 Subject: [PATCH] scripts/vagrant: Replace lsb_release with os-release check lsb_release is not shipped under latest fedora distros, hence failing this check. Use /etc/os-release instead. Signed-off-by: Michal Berger Change-Id: Id74095ff5dd5d43f7a97e4c5d026ac13da26d815 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15107 Reviewed-by: Ben Walker Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins Reviewed-by: Kamil Godzwon --- scripts/vagrant/create_nvme_img.sh | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/scripts/vagrant/create_nvme_img.sh b/scripts/vagrant/create_nvme_img.sh index 7452b0af6..8be9fdbbe 100755 --- a/scripts/vagrant/create_nvme_img.sh +++ b/scripts/vagrant/create_nvme_img.sh @@ -51,24 +51,20 @@ if [ "${SYSTEM}" != "Linux" ]; then exit 2 fi -WHICH_OS=$(lsb_release -i | awk '{print $3}') +source /etc/os-release qemu-img create -f raw "$nvme_disk" -o preallocation="$preallocation" $size -case $WHICH_OS in - "Fedora") +# That's just a wild guess for now +# TODO: needs improvement for other distros +qemu_user_group="libvirt-qemu:kvm" + +case "$ID" in + "fedora") qemu_user_group="qemu:qemu" # Change SE Policy sudo chcon -t svirt_image_t "$nvme_disk" ;; - "Ubuntu") - qemu_user_group="libvirt-qemu:kvm" - ;; - *) - # That's just a wild guess for now - # TODO: needs improvement for other distros - qemu_user_group="libvirt-qemu:kvm" - ;; esac chmod 777 "$nvme_disk"