From e55297a8f09e427dc237bf2a0a2e18fbcdc9fe46 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 19 Aug 2014 19:28:38 -0700
Subject: [PATCH] vboxwrapper: change option name to "network_bridged_mode"

---
 samples/vboxwrapper/vbox.cpp        | 4 ++--
 samples/vboxwrapper/vbox.h          | 2 +-
 samples/vboxwrapper/vboxwrapper.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/vboxwrapper/vbox.cpp b/samples/vboxwrapper/vbox.cpp
index 9b3148e095..f1d102cabb 100644
--- a/samples/vboxwrapper/vbox.cpp
+++ b/samples/vboxwrapper/vbox.cpp
@@ -101,7 +101,7 @@ VBOX_VM::VBOX_VM() {
     enable_remotedesktop = false;
     register_only = false;
     enable_network = false;
-    enable_network_bridged_mode = false;
+    network_bridged_mode = false;
     pf_guest_port = 0;
     pf_host_port = 0;
     headless = true;
@@ -519,7 +519,7 @@ int VBOX_VM::create_vm() {
 
     // Tweak the VM's Network Configuration
     //
-    if (enable_network_bridged_mode) {
+    if (network_bridged_mode) {
         fprintf(
             stderr,
             "%s Setting Network Configuration for Bridged Mode.\n",
diff --git a/samples/vboxwrapper/vbox.h b/samples/vboxwrapper/vbox.h
index 38abccadac..2e649ce7b4 100644
--- a/samples/vboxwrapper/vbox.h
+++ b/samples/vboxwrapper/vbox.h
@@ -140,7 +140,7 @@ public:
         // whether to add an extra cache disk for systems like uCernVM
     bool enable_network;
         // whether to allow network access
-    bool enable_network_bridged_mode;
+    bool network_bridged_mode;
         // use bridged mode for network
     bool enable_shared_directory;
         // whether to use shared directory infrastructure
diff --git a/samples/vboxwrapper/vboxwrapper.cpp b/samples/vboxwrapper/vboxwrapper.cpp
index 7195954cb5..8ec7609fb1 100644
--- a/samples/vboxwrapper/vboxwrapper.cpp
+++ b/samples/vboxwrapper/vboxwrapper.cpp
@@ -199,7 +199,7 @@ int parse_job_file(VBOX_VM& vm) {
         else if (xp.parse_string("fraction_done_filename", vm.fraction_done_filename)) continue;
         else if (xp.parse_bool("enable_cern_dataformat", vm.enable_cern_dataformat)) continue;
         else if (xp.parse_bool("enable_network", vm.enable_network)) continue;
-        else if (xp.parse_bool("enable_network_bridged_mode", vm.enable_network_bridged_mode)) continue;
+        else if (xp.parse_bool("network_bridged_mode", vm.network_bridged_mode)) continue;
         else if (xp.parse_bool("enable_shared_directory", vm.enable_shared_directory)) continue;
         else if (xp.parse_bool("enable_floppyio", vm.enable_floppyio)) continue;
         else if (xp.parse_bool("enable_cache_disk", vm.enable_cache_disk)) continue;