Commit 29203e6c authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Little cleanups. Nothing serious.

parent dad6ee1a
......@@ -26,13 +26,6 @@ my $SFSHOSTKEY = "/etc/sfs/sfs_host_key";
my $MOUNTINFO = "/var/db/mounttab";
my $LOCATEDB = "/var/db/locate.database";
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/testbed";
use libsetup;
#
# Untaint path
#
......@@ -44,6 +37,13 @@ delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
#
$| = 1;
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/testbed";
use libsetup;
#
# First clean up the node as it would be if free.
#
......
......@@ -12,13 +12,6 @@ use English;
#
my $reboot = 0;
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/testbed";
use libsetup;
#
# Untaint path
#
......@@ -30,6 +23,13 @@ delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
#
$| = 1;
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/testbed";
use libsetup;
print STDOUT "Checking Testbed Delta configuration ... \n";
#
......
......@@ -17,13 +17,6 @@ use English;
# Otherwise, we have no safe way to determine the domain.
#
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/testbed";
use libsetup;
#
# Untaint path
#
......@@ -35,6 +28,13 @@ delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
#
$| = 1;
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/testbed";
use libsetup;
#
# Check to see if hostname actually set yet. The dhclient exit hook gets
# invoked no matter what, and typically the first or second DHCP fails,
......
......@@ -33,6 +33,10 @@ install: misc-install script-install bin-install
dir-install:
$(INSTALL) -m 755 -o root -g wheel -d $(INSTALL_DIR)
$(INSTALL) -m 755 -o root -g wheel -d /var/emulab
$(INSTALL) -m 755 -o root -g wheel -d /var/emulab/db
$(INSTALL) -m 755 -o root -g wheel -d /var/emulab/jails
$(INSTALL) -m 755 -o root -g wheel -d /var/emulab/logs
-rm -f /etc/testbed
-ln -s $(INSTALL_DIR) /etc/testbed
......
......@@ -23,13 +23,6 @@ my $NTPDRIFT = "/etc/ntp/drift";
my $SFSUSERS = "/etc/sfs/sfs_users";
my $SFSHOSTKEY = "/etc/sfs/sfs_host_key";
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/rc.d/testbed";
use libsetup;
#
# Untaint path
#
......@@ -41,6 +34,13 @@ delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
#
$| = 1;
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/rc.d/testbed";
use libsetup;
#
# First clean up the node as it would be if free.
#
......
......@@ -12,13 +12,6 @@ use English;
#
my $reboot = 0;
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/rc.d/testbed";
use libsetup;
#
# Untaint path
#
......@@ -30,6 +23,13 @@ delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
#
$| = 1;
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/rc.d/testbed";
use libsetup;
print STDOUT "Checking Testbed Delta configuration ... \n";
#
......
......@@ -7,13 +7,6 @@
use English;
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/rc.d/testbed";
use libsetup;
#
# Untaint path
#
......@@ -29,9 +22,15 @@ sub background();
#
# Turn off line buffering on output
#
$| = 1;
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/rc.d/testbed";
use libsetup;
#
# Get the config parameters so we can open up a log file in the proper
# location. See below.
......
......@@ -22,13 +22,6 @@ use English;
# domain suffix.
#
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/rc.d/testbed";
use libsetup;
#
# Untaint path
#
......@@ -38,6 +31,13 @@ delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
# Turn off line buffering on output
$| = 1;
#
# Load the OS independent support library. It will load the OS dependent
# library and initialize itself.
#
use lib "/etc/rc.d/testbed";
use libsetup;
if (@ARGV) {
my $token = shift;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment