openstack
/
fuel-main
Code Issues Proposed changes

Merge "Blacklist didn't work if running VirtualBox"

This commit is contained in:
Jenkins 2015-12-17 21:01:31 +00:00 committed by Gerrit Code Review
parent 91ac287a44 fa79aa017a
commit 243e735464
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
iso/ks.template
View File

@ -558,14 +558,14 @@ sed -i --follow-symlinks -e '/^\slinux16/ s/rhgb/debug/' /boot/grub2/grub.cfg
cp -f /etc/skel/.bash* /root/
# Blacklist i2c_piix4 module for VirtualBox so it does not create kernel errors
[[ $(virt-what) = "virtualbox" ]] && echo "blacklist i2c_piix4" > /etc/modprobe.d/blacklist-i2c-piix4.conf
(virt-what | fgrep -q "virtualbox") && echo "blacklist i2c_piix4" > /etc/modprobe.d/blacklist-i2c-piix4.conf
# Blacklist intel_rapl module for VirtualBox so it does not create kernel errors
[[ $(virt-what) = "virtualbox" ]] && echo "blacklist intel_rapl" > /etc/modprobe.d/blacklist-intel-rapl.conf
(virt-what | fgrep -q "virtualbox") && echo "blacklist intel_rapl" > /etc/modprobe.d/blacklist-intel-rapl.conf
# Disable sshd until after Fuel Setup if not running on VirtualBox
# TODO(mattymo): Remove VBox exception after LP#1487047 is fixed
[[ $(virt-what) = "virtualbox" ]] || systemctl disable sshd
(virt-what | fgrep -q "virtualbox") || systemctl disable sshd
%end