Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

tbsetup/snmpit_test/snmpit_lib.pm

@@ -312,7 +312,7 @@ sub getVlanPorts (@) {
     my @ports = ();
 
     foreach my $vlanid (@vlans) {	
-
+        
     	my $vlan = VLan->Lookup($vlanid);
     	if (!defined($vlan)) {
         	die("*** $0:\n".
@@ -323,30 +323,22 @@ sub getVlanPorts (@) {
         	die("*** $0:\n".
 		    "    Unable to load members for $vlan\n");
 	}
-	my %pathifaces = ();
-	my $error = getPathVlanIfaces($vlanid, \%pathifaces);
-	if ($error < 0) {
-	    die("*** $0:\n".
-		"    Error getting path interfaces for $vlan\n");
-	}
-	if ($error == 0) {
-	    foreach my $k (keys %pathifaces) {
-		push(@ports, Port->LookupByIface($pathifaces{$k}));
-	    }
-	}
-	else {
-	    foreach my $member (@members) {
-	 	my $nodeid;
-	 	my $iface;
-
-		if ($member->GetAttribute("node_id", \$nodeid) != 0 ||
-		    $member->GetAttribute("iface", \$iface) != 0) {
-		    die("*** $0:\n".
-			"    Missing attributes for $member in $vlan\n");
-		}
-		push(@ports, Port->LookupByIface($nodeid, $iface));
+	
+	#
+	# getPathVlanIfaces call removed because we've made
+	# virtual ports and wires.
+	#
+	foreach my $member (@members) {
+	    my $nodeid;
+	    my $iface;
+	    
+	    if ($member->GetAttribute("node_id", \$nodeid) != 0 ||
+		$member->GetAttribute("iface", \$iface) != 0) {
+		die("*** $0:\n".
+		    "    Missing attributes for $member in $vlan\n");
 	    }
-	}
+	    push(@ports, Port->LookupByIface($nodeid, $iface));
+	}	
     }
     return @ports;
 }

utils/create_image.in

@@ -53,8 +53,8 @@ sub usage()
 my $optlist  = "p:wsNd";
 my $waitmode = 0;
 my $usessh = 0;
-my $usenfs = 0;
-my $usefup = 1;
+my $usenfs = 1;
+my $usefup = 0;
 
 #
 # Configure variables
@@ -538,6 +538,14 @@ if ($usefup && $result eq "255") {
     } else {
 	$command .= " $filename";
     }
+
+    # reset state for check_progress
+    $usefup = 0;
+    $runticks = 0;
+    $idleticks = 0;
+    $lastsize = 0;
+    $result = undef;
+
     if ($NONFS) {
 	$result = run_with_ssh($command, $filename);
     } else {