forked from pool/vagrant
f6b4f08f59
Rebase patches for v2.2.6 OBS-URL: https://build.opensuse.org/request/show/742602 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=36
69 lines
2.4 KiB
Diff
69 lines
2.4 KiB
Diff
From 6cabd408fd06b60b0b0c74c93da9fea05e8b0339 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 08/14] 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 e9f64a940..9236c1b2b 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 a954b45bd..2e490f5e2 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 7bc8ceca0..e938305e7 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.23.0
|
|
|