summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2019-02-19 15:31:40 -0800
committerVictor Morales <victor.morales@intel.com>2019-02-19 15:31:51 -0800
commit1a7ec9a17e82481b2b6b527988c8c2ba8aa70d1b (patch)
treec2c7c3fd46dcc05996290cbef6c5a723030a984b
parent376223b37af0867b4c051f02bac54fae35e0d699 (diff)
Fix setup.sh sudo permissions
There are some instructions in the setup.sh script file which require the addition of sudo instruction. This change fixes them. Change-Id: If680d9d9aac2a4b22d665b58ab31a4693c71588e Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: MULTICLOUD-301
-rwxr-xr-xvagrant/setup.sh20
1 files changed, 12 insertions, 8 deletions
diff --git a/vagrant/setup.sh b/vagrant/setup.sh
index a135ea96..0fb1b0d6 100755
--- a/vagrant/setup.sh
+++ b/vagrant/setup.sh
@@ -159,20 +159,20 @@ if [[ $vendor_id == *GenuineIntel* ]]; then
kvm_ok=$(cat /sys/module/kvm_intel/parameters/nested)
if [[ $kvm_ok == 'N' ]]; then
echo "Enable Intel Nested-Virtualization"
- rmmod kvm-intel
- echo 'options kvm-intel nested=y' >> /etc/modprobe.d/dist.conf
- modprobe kvm-intel
+ sudo rmmod kvm-intel
+ echo 'options kvm-intel nested=y' | sudo tee --append /etc/modprobe.d/dist.conf
+ sudo modprobe kvm-intel
fi
else
kvm_ok=$(cat /sys/module/kvm_amd/parameters/nested)
if [[ $kvm_ok == '0' ]]; then
echo "Enable AMD Nested-Virtualization"
- rmmod kvm-amd
- sh -c "echo 'options kvm-amd nested=1' >> /etc/modprobe.d/dist.conf"
- modprobe kvm-amd
+ sudo rmmod kvm-amd
+ echo 'options kvm-amd nested=1' | sudo tee --append /etc/modprobe.d/dist.conf
+ sudo modprobe kvm-amd
fi
fi
-modprobe vhost_net
+sudo modprobe vhost_net
${INSTALLER_CMD} ${packages[@]}
if ! which pip; then
@@ -193,5 +193,9 @@ if [ $VAGRANT_DEFAULT_PROVIDER == libvirt ]; then
sudo systemctl enable rpc-statd
sudo systemctl start rpc-statd
- kvm-ok
+ case ${ID,,} in
+ ubuntu|debian)
+ kvm-ok
+ ;;
+ esac
fi