jenkins-bot has submitted this change and it was merged.
Change subject: VBoxLinuxAdditions's install.sh takes 'force' sub-command, not
'--force' option
......................................................................
VBoxLinuxAdditions's install.sh takes 'force' sub-command, not '--force' option
This patch fixes a mistake in update-guest-additions which caused it to invoke
the VirtualBox Guest Additions installation script with incorrect command-line
arguments.
Bug: 51471
Change-Id: I40f7d865aa758be8001184c8fc4a80812f6d6e99
---
M puppet/modules/misc/files/update-guest-additions
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mattflaschen: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/misc/files/update-guest-additions
b/puppet/modules/misc/files/update-guest-additions
index 7d1ca5d..5b3980c 100755
--- a/puppet/modules/misc/files/update-guest-additions
+++ b/puppet/modules/misc/files/update-guest-additions
@@ -90,7 +90,7 @@
notice "Running installer. Ignore any warnings about the 'Window System' or
missing 'X.Org' or 'XFree86'."
cd "${MOUNTPOINT}"
-./VBoxLinuxAdditions.run --nox11 -- --force && {
+./VBoxLinuxAdditions.run --nox11 -- force && {
notice 'All done. Shutting down. Run "vagrant up" to start the machine.'
shutdown -h now
}
--
To view, visit https://gerrit.wikimedia.org/r/74115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40f7d865aa758be8001184c8fc4a80812f6d6e99
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
