From 5ef8d892023064745c3552c10c4b300cf09a4e0b Mon Sep 17 00:00:00 2001 From: Francis Jeanneau Date: Fri, 22 Jun 2018 10:33:02 -0400 Subject: [PATCH 1/2] Use builtin triggers with vagrant 2.1.1 --- Vagrantfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index d15ce5d..cf9aa24 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -150,10 +150,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| ####################################################################### } - config.trigger.after :up do - run "./scripts/post_up.sh" + config.trigger.after :up do |trigger| + trigger.run = {path: "scripts/post_up.sh"} end - config.trigger.after :halt do - run "./scripts/post_halt.sh" + config.trigger.after :halt do |trigger| + trigger.run = {path: "scripts/post_halt.sh"} end end From db7142a4ce96d72b1e0d293616522ad39a94149c Mon Sep 17 00:00:00 2001 From: Francis Jeanneau Date: Fri, 22 Jun 2018 10:36:38 -0400 Subject: [PATCH 2/2] Update README.md to remove vagrant-triggers ref --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index d0f5ac2..1e8fc56 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,6 @@ Requirements You need a recent vagrant installed and virtualbox. Get it at http://www.vagrantup.com/downloads.html and https://www.virtualbox.org/wiki/Downloads -The plugin vagrant-trigger is also required (see below for installing it). - You also need to have root access via sudo so the script can add NAT rules. Currently Linux and Mac OS X hosts are supported. @@ -22,8 +20,6 @@ Get it and use it: git clone https://github.com/multipath-tcp/mptcp-vagrant.git cd mptcp-vagrant - # only the first time: - vagrant plugin install vagrant-triggers vagrant up This will: