scripts/vagrant: create nvme refactoring
- throw error instead of silently skipping create disks on non-linux OS - early return/exit from script - add quotes around disk name - use case/esac to check WHICH_OS - other small syntax changes Signed-off-by: Pawel Piatek <pawelx.piatek@intel.com> Change-Id: I71879bf635ecb275e805b6fcb3ec9d6bc3bc299f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6169 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Michal Berger <michalx.berger@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
parent
0081cfeaae
commit
86475967d3
@ -41,37 +41,45 @@ while getopts "s:n:t:h-:" opt; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ ! "${SYSTEM}" = "FreeBSD" ]; then
|
if [ "${SYSTEM}" != "Linux" ]; then
|
||||||
WHICH_OS=$(lsb_release -i | awk '{print $3}')
|
echo "This script supports only Linux OS" >&2
|
||||||
case $type in
|
exit 2
|
||||||
"nvme")
|
fi
|
||||||
qemu-img create -f raw $nvme_disk $size
|
|
||||||
;;
|
|
||||||
"ocssd")
|
|
||||||
if [ $size == "1024M" ]; then
|
|
||||||
size="9G"
|
|
||||||
fi
|
|
||||||
fallocate -l $size $nvme_disk
|
|
||||||
touch ${nvme_disk}_ocssd_md
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "We support only nvme and ocssd disks types"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
#Change SE Policy on Fedora
|
|
||||||
if [ $WHICH_OS == "Fedora" ]; then
|
|
||||||
sudo chcon -t svirt_image_t $nvme_disk
|
|
||||||
fi
|
|
||||||
|
|
||||||
chmod 777 $nvme_disk
|
WHICH_OS=$(lsb_release -i | awk '{print $3}')
|
||||||
if [ $WHICH_OS == "Fedora" ]; then
|
case $type in
|
||||||
chown qemu:qemu $nvme_disk
|
"nvme")
|
||||||
elif [ $WHICH_OS == "Ubuntu" ]; then
|
qemu-img create -f raw "$nvme_disk" $size
|
||||||
chown libvirt-qemu:kvm $nvme_disk
|
;;
|
||||||
else
|
"ocssd")
|
||||||
|
if [ $size == "1024M" ]; then
|
||||||
|
size="9G"
|
||||||
|
fi
|
||||||
|
fallocate -l $size "$nvme_disk"
|
||||||
|
touch "${nvme_disk}_ocssd_md"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "We support only nvme and ocssd disks types"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
case $WHICH_OS 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
|
# That's just a wild guess for now
|
||||||
# TODO: needs improvement for other distros
|
# TODO: needs improvement for other distros
|
||||||
chown libvirt-qemu:kvm $nvme_disk
|
qemu_user_group="libvirt-qemu:kvm"
|
||||||
fi
|
;;
|
||||||
fi
|
esac
|
||||||
|
|
||||||
|
chmod 777 "$nvme_disk"
|
||||||
|
chown $qemu_user_group "$nvme_disk"
|
||||||
|
Loading…
Reference in New Issue
Block a user