diff options
| -rw-r--r-- | Vagrantfile | 3 | ||||
| -rw-r--r-- | vagrant_build.sh | 25 | ||||
| -rw-r--r-- | vagrant_provision.sh | 21 |
3 files changed, 44 insertions, 5 deletions
diff --git a/Vagrantfile b/Vagrantfile index e5e952c12b..6f286b6136 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -15,9 +15,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| v.cpus = 2 end - # Share the source directory into the VM as `/wireshark` - config.vm.synced_folder ".", "/wireshark" - # Permit X11 forwarding so running the graphical Wireshark works config.ssh.forward_x11 = true diff --git a/vagrant_build.sh b/vagrant_build.sh index 648ed3451b..6272003f80 100644 --- a/vagrant_build.sh +++ b/vagrant_build.sh @@ -1,7 +1,28 @@ #!/bin/bash +# +# Copyright 2015 Evan Huus <eapache@gmail.com> +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + set -e mkdir -p build cd build -cmake /wireshark/ -make -j2 +cmake /vagrant/ +make -j3 diff --git a/vagrant_provision.sh b/vagrant_provision.sh index 95941133e3..3504b7becd 100644 --- a/vagrant_provision.sh +++ b/vagrant_provision.sh @@ -1,4 +1,25 @@ #!/bin/bash +# +# Copyright 2015 Evan Huus <eapache@gmail.com> +# +# Wireshark - Network traffic analyzer +# By Gerald Combs <gerald@wireshark.org> +# Copyright 1998 Gerald Combs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + set -e apt-get update |