b2269a63f2
Update to 2.2.5, rebase patches, fix test failures with of vagrant-libvirt, fix issues on ARM, fix dependency issues with addressable OBS-URL: https://build.opensuse.org/request/show/727276 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=34
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From 63f9c59d213cea81ce5a509d2d1ecadd7a48dc64 Mon Sep 17 00:00:00 2001
|
|
From: Johannes Kastl <kastl@b1-systems.de>
|
|
Date: Fri, 16 Nov 2018 21:12:43 +0100
|
|
Subject: [PATCH 05/15] fix vbox package boo#1044087, added by
|
|
robert.munteanu@gmail.com on Sun Aug 13 19:07:06 UTC 2017
|
|
|
|
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
|
---
|
|
plugins/providers/virtualbox/action/package.rb | 2 +-
|
|
plugins/providers/virtualbox/action/package_setup_folders.rb | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/plugins/providers/virtualbox/action/package.rb b/plugins/providers/virtualbox/action/package.rb
|
|
index fb5ebdabf..c03c1c373 100644
|
|
--- a/plugins/providers/virtualbox/action/package.rb
|
|
+++ b/plugins/providers/virtualbox/action/package.rb
|
|
@@ -1,4 +1,4 @@
|
|
-require_relative "../../../../lib/vagrant/action/general/package"
|
|
+require "vagrant/action/general/package"
|
|
|
|
module VagrantPlugins
|
|
module ProviderVirtualBox
|
|
diff --git a/plugins/providers/virtualbox/action/package_setup_folders.rb b/plugins/providers/virtualbox/action/package_setup_folders.rb
|
|
index a0baf516f..867fe2bf8 100644
|
|
--- a/plugins/providers/virtualbox/action/package_setup_folders.rb
|
|
+++ b/plugins/providers/virtualbox/action/package_setup_folders.rb
|
|
@@ -1,6 +1,6 @@
|
|
require "fileutils"
|
|
|
|
-require_relative "../../../../lib/vagrant/action/general/package_setup_folders"
|
|
+require "vagrant/action/general/package"
|
|
|
|
module VagrantPlugins
|
|
module ProviderVirtualBox
|
|
--
|
|
2.22.1
|
|
|