Commit 21273c58 authored by Mac Newbold's avatar Mac Newbold
Browse files

Fixed 'require' to 'use' for properly using Exporter lib modules.

parent bb092846
...@@ -25,32 +25,26 @@ my $lockfile = "/var/tmp/testbed_named_lockfile"; ...@@ -25,32 +25,26 @@ my $lockfile = "/var/tmp/testbed_named_lockfile";
my $dbg = 0; my $dbg = 0;
my @row; my @row;
#
# We don't want to run this script unless its the real version. # We don't want to run this script unless its the real version.
#
if ($EUID != 0) { if ($EUID != 0) {
die("Must be root! Maybe its a development version?"); die("Must be root! Maybe its a development version?\n");
} }
# XXX Hacky! # XXX Hacky!
if ($TB ne "/usr/testbed") { if ($TB ne "/usr/testbed") {
die("Wrong version. Maybe its a development version?"); die("Wrong version. Maybe its a development version?\n");
} }
# un-taint path # un-taint path
$ENV{'PATH'} = '/bin:/usr/bin:/usr/sbin:/usr/local/bin'; $ENV{'PATH'} = '/bin:/usr/bin:/usr/sbin:/usr/local/bin';
delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'}; delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
#
# Turn off line buffering on output # Turn off line buffering on output
#
$| = 1; $| = 1;
#
# Testbed Support libraries # Testbed Support libraries
# use lib "@prefix@/lib";
push(@INC, "$TB/lib"); use libtestbed;
require libtestbed; use libdb;
require libdb;
# #
# We need to serialize this script to avoid a trashed map file. Use # We need to serialize this script to avoid a trashed map file. Use
......
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