Dirk Mueller
aaa1322dcd
Bump vagrant version to 2.2.2 OBS-URL: https://build.opensuse.org/request/show/664720 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=25
69 lines
2.4 KiB
Diff
69 lines
2.4 KiB
Diff
From f3e8e9f37f4d6408a9e4a689e81e2ced67d21939 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
|
|
Date: Fri, 11 Jan 2019 12:32:28 +0100
|
|
Subject: [PATCH] Don't abuse relative paths in plugins
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Dan Čermák <dcermak@suse.com>
|
|
---
|
|
plugins/guests/alt/cap/configure_networks.rb | 2 +-
|
|
plugins/guests/coreos/cap/configure_networks.rb | 2 +-
|
|
plugins/guests/nixos/cap/change_host_name.rb | 2 +-
|
|
plugins/provisioners/chef/provisioner/base.rb | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/plugins/guests/alt/cap/configure_networks.rb b/plugins/guests/alt/cap/configure_networks.rb
|
|
index 851849700..80071e817 100644
|
|
--- a/plugins/guests/alt/cap/configure_networks.rb
|
|
+++ b/plugins/guests/alt/cap/configure_networks.rb
|
|
@@ -1,6 +1,6 @@
|
|
require "tempfile"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestALT
|
|
diff --git a/plugins/guests/coreos/cap/configure_networks.rb b/plugins/guests/coreos/cap/configure_networks.rb
|
|
index 827c8f075..e0c68359f 100644
|
|
--- a/plugins/guests/coreos/cap/configure_networks.rb
|
|
+++ b/plugins/guests/coreos/cap/configure_networks.rb
|
|
@@ -1,6 +1,6 @@
|
|
require "tempfile"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestCoreOS
|
|
diff --git a/plugins/guests/nixos/cap/change_host_name.rb b/plugins/guests/nixos/cap/change_host_name.rb
|
|
index 340eddeab..bacae1f0d 100644
|
|
--- a/plugins/guests/nixos/cap/change_host_name.rb
|
|
+++ b/plugins/guests/nixos/cap/change_host_name.rb
|
|
@@ -1,6 +1,6 @@
|
|
require "tempfile"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestNixos
|
|
diff --git a/plugins/provisioners/chef/provisioner/base.rb b/plugins/provisioners/chef/provisioner/base.rb
|
|
index 607909a4e..d8d006f36 100644
|
|
--- a/plugins/provisioners/chef/provisioner/base.rb
|
|
+++ b/plugins/provisioners/chef/provisioner/base.rb
|
|
@@ -1,7 +1,7 @@
|
|
require "tempfile"
|
|
|
|
require_relative "../../../../lib/vagrant/util/presence"
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
require_relative "../installer"
|
|
|
|
--
|
|
2.20.1
|
|
|