2017-08-31 21:03:29 +02:00
|
|
|
From 246fe8ff4bb69cfffa7e44e4e571f2febc5e7719 Mon Sep 17 00:00:00 2001
|
2016-04-12 19:31:48 +02:00
|
|
|
From: Antonio Terceiro <terceiro@debian.org>
|
|
|
|
Date: Sat, 11 Oct 2014 16:54:58 -0300
|
2017-08-31 21:03:29 +02:00
|
|
|
Subject: [PATCH] bin/vagrant: silence warning about installer
|
2016-04-12 19:31:48 +02:00
|
|
|
|
2017-08-31 21:03:29 +02:00
|
|
|
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
2016-04-12 19:31:48 +02:00
|
|
|
---
|
2017-08-31 21:03:29 +02:00
|
|
|
bin/vagrant | 16 ----------------
|
|
|
|
1 file changed, 16 deletions(-)
|
2016-04-12 19:31:48 +02:00
|
|
|
|
|
|
|
diff --git a/bin/vagrant b/bin/vagrant
|
2017-08-31 21:03:29 +02:00
|
|
|
index 19df75033..6667ab152 100755
|
2016-04-12 19:31:48 +02:00
|
|
|
--- a/bin/vagrant
|
|
|
|
+++ b/bin/vagrant
|
2017-08-31 21:03:29 +02:00
|
|
|
@@ -117,22 +117,6 @@ begin
|
2016-04-12 19:31:48 +02:00
|
|
|
logger.debug("Creating Vagrant environment")
|
|
|
|
env = Vagrant::Environment.new(opts)
|
|
|
|
|
2017-08-31 21:03:29 +02:00
|
|
|
- # If we are running with the Windows Subsystem for Linux do
|
|
|
|
- # some extra setup to allow access to Vagrant managed machines
|
|
|
|
- # outside the subsystem
|
|
|
|
- if Vagrant::Util::Platform.wsl?
|
|
|
|
- recreate_env = Vagrant::Util::Platform.wsl_init(env, logger)
|
|
|
|
- if recreate_env
|
|
|
|
- logger.info("Re-creating Vagrant environment due to WSL modifications.")
|
|
|
|
- env = Vagrant::Environment.new(opts)
|
|
|
|
- end
|
|
|
|
- end
|
|
|
|
-
|
2016-04-12 19:31:48 +02:00
|
|
|
- if !Vagrant.in_installer? && !Vagrant.very_quiet?
|
|
|
|
- # If we're not in the installer, warn.
|
|
|
|
- env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false)
|
|
|
|
- end
|
|
|
|
-
|
|
|
|
begin
|
|
|
|
# Execute the CLI interface, and exit with the proper error code
|
|
|
|
exit_status = env.cli(argv)
|
2017-08-31 21:03:29 +02:00
|
|
|
--
|
|
|
|
2.13.0
|
|
|
|
|