From 7a71e8d31dae5b89fa99275644f34cfe22c4b983 Mon Sep 17 00:00:00 2001
From: "David M. Johnson" <johnsond@flux.utah.edu>
Date: Thu, 5 Oct 2017 00:43:55 -0600
Subject: [PATCH] Docker clientside bugfix: minor bug in vlandev bookkeeping.

---
 clientside/tmcc/linux/docker/libvnode_docker.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/clientside/tmcc/linux/docker/libvnode_docker.pm b/clientside/tmcc/linux/docker/libvnode_docker.pm
index 299c06e4b..a2cd14a89 100644
--- a/clientside/tmcc/linux/docker/libvnode_docker.pm
+++ b/clientside/tmcc/linux/docker/libvnode_docker.pm
@@ -1966,12 +1966,12 @@ sub rootPreConfigNetwork($$$$)
 	    # Temporary, to get existing devices after upgrade.
 	    #mysystem2("$ETHTOOL -K $vdev tso off gso off");
 
+	    $physdev =  $vdev;
+	    $brname  = $prefix . $vdev;
+
 	    # We save this so we can garbage-collect it in vnodeDestroy.
 	    # But we don't remove it here if there's a failure.
 	    $private->{'vlandevs'}->{$brname} = $vdev;
-
-	    $physdev =  $vdev;
-	    $brname  = $prefix . $vdev;
 	    $brs{$brname}{ENCAP} = 1;
 	    $brs{$brname}{SHORT} = 0;
 	    $brs{$brname}{PHYSDEV} = $vdev;
-- 
GitLab