mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-07-20 20:34:25 +02:00
Merge pull request #3489 from Icinga/bugfix/vagrant-box-broken-parallels-3488
Don't update Parallels Tools automatically
This commit is contained in:
commit
51307d77a9
@ -1,14 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# If the installed version is outdated, try to update.
|
|
||||||
|
|
||||||
# The updater seems to try to install kernel-devel-$(uname -r) which is not
|
|
||||||
# available in case of an outdated kernel version.
|
|
||||||
# If the updater fails (for this reason), we try to upgrade the kernel in the
|
|
||||||
# hope that the updater will succeed on the next reboot.
|
|
||||||
|
|
||||||
ptiagent-cmd --ver || \
|
|
||||||
ptiagent-cmd --install || \
|
|
||||||
yum update kernel -y
|
|
5
Vagrantfile
vendored
5
Vagrantfile
vendored
@ -28,11 +28,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
|||||||
config.vm.provider :parallels do |p, override|
|
config.vm.provider :parallels do |p, override|
|
||||||
p.name = "Icinga Web 2 Development"
|
p.name = "Icinga Web 2 Development"
|
||||||
|
|
||||||
# Update Parallels Tools automatically ...
|
|
||||||
p.update_guest_tools = false
|
|
||||||
# ... but don't fail completely. (see the shell script)
|
|
||||||
override.vm.provision :shell, :run => "always", :path => ".puppet/manifests/parallels-upgrade-guest-tools.sh"
|
|
||||||
|
|
||||||
# Set power consumption mode to "Better Performance"
|
# Set power consumption mode to "Better Performance"
|
||||||
p.optimize_power_consumption = false
|
p.optimize_power_consumption = false
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user