kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #55 from myhro/fix-guestadditions

Browse source 
Don't check Guest Additions installation status
This commit is contained in:
Anders Ingemann 2014-04-02 08:36:32 +02:00
commit a037acc673
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
providers/virtualbox/tasks/guest_additions.py
View file

@ -52,13 +52,7 @@ class InstallGuestAdditions(Task):
install_script = os.path.join('/', mount_dir, 'VBoxLinuxAdditions.run') install_script = os.path.join('/', mount_dir, 'VBoxLinuxAdditions.run')
from common.tools import log_call from common.tools import log_call
status, out, err = log_call(['chroot', info.root, log_call(['chroot', info.root, install_script, '--nox11'])
install_script, '--nox11'])
# Install will exit with $?=1 because X11 isn't installed
if status != 1:
msg = ('VBoxLinuxAdditions.run exited with status {status}, '
'it should exit with status 1').format(status=status)
raise TaskError(msg)
log_call(['chroot', info.root, 'service', 'vboxadd-service', 'stop']) log_call(['chroot', info.root, 'service', 'vboxadd-service', 'stop'])
root.remove_mount(mount_path) root.remove_mount(mount_path)