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

tmcd/linux/libvnode.pm

 #!/usr/bin/perl -wT
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2008-2009 University of Utah and the Flux Group.
+# Copyright (c) 2008-2010 University of Utah and the Flux Group.
 # All rights reserved.
 #
 # Implements the libvnode API for OpenVZ support in Emulab.
@@ -40,8 +40,6 @@ my $VCNET_NET	    = "172.16.0.0";
 my $VCNET_MASK      = "255.240.0.0";
 my $VCNET_GW	    = "172.16.0.1";
 
-my $BOSS_IP_FILE    = "/var/emulab/boot/bossip";
-
 my $debug = 0;
 
 sub mysystem($);
@@ -427,12 +425,11 @@ sub findDNS($)
 {
     my ($ip) = @_;
 
-    my $bossip = (-r $BOSS_IP_FILE) ? `cat $BOSS_IP_FILE` : "0";
-    chomp($bossip);
+    my ($bossname,$bossip) = libtmcc::tmccbossinfo();
     if ($bossip =~ /^(\d+\.\d+\.\d+\.\d+)$/) {
 	$bossip = $1;
     } else {
-	die "Could not find boss IP address (no $BOSS_IP_FILE?)";
+	die "Could not find boss IP address (tmccbossinfo failed?)";
     }
 
     return $bossip;

tmcd/linux/mkvnode.pl

 #!/usr/bin/perl -w
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2009 University of Utah and the Flux Group.
+# Copyright (c) 2009-2010 University of Utah and the Flux Group.
 # All rights reserved.
 #
 use strict;
@@ -137,7 +137,7 @@ if ($debug) {
 # Need the domain, but no conistent way to do it. Ask tmcc for the
 # boss node and parse out the domain. 
 #
-my $DOMAINNAME = tmccbossname();
+my ($DOMAINNAME,$BOSSIP) = tmccbossinfo();
 die("Could not get bossname from tmcc!")
     if (!defined($DOMAINNAME));
 
@@ -149,10 +149,8 @@ else {
 }
 
 #
-# Need the bossip, which we get from virthost emulab boot dir:
+# Need the bossip, which was returned above
 #
-my $BOSSIP = `cat $BOOTDIR/bossip`;
-chomp($BOSSIP);
 if ($BOSSIP !~ /^\d+\.\d+\.\d+\.\d+$/) {
     die "Bad bossip '$BOSSIP' in $BOOTDIR/bossip!";
 }

tmcd/linux/vnodectl

 #!/usr/bin/perl -wT
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2009 University of Utah and the Flux Group.
+# Copyright (c) 2009-2010 University of Utah and the Flux Group.
 # All rights reserved.
 #
 
@@ -285,7 +285,7 @@ if ($debug) {
 # Need the domain, but no conistent way to do it. Ask tmcc for the
 # boss node and parse out the domain. 
 #
-my $DOMAINNAME = tmccbossname();
+my ($DOMAINNAME,$BOSSIP) = tmccbossinfo();
 die("Could not get bossname from tmcc!")
     if (!defined($DOMAINNAME));
 
@@ -297,10 +297,8 @@ else {
 }
 
 #
-# Need the bossip, which we get from virthost emulab boot dir:
+# Need the bossip, which was returned above.
 #
-my $BOSSIP = `cat $BOOTDIR/bossip`;
-chomp($BOSSIP);
 if ($BOSSIP !~ /^\d+\.\d+\.\d+\.\d+$/) {
     die "Bad bossip '$BOSSIP' in $BOOTDIR/bossip!";
 }