Commit 19b6d02e authored by Robert Ricci's avatar Robert Ricci
Browse files

Moved plasticwrap to use configure, so that it can get the right boss node

and ops email address.
parent 9a2488d7
...@@ -1053,6 +1053,7 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -1053,6 +1053,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
os/frisbee.redux/GNUmakefile \ os/frisbee.redux/GNUmakefile \
pxe/GNUmakefile pxe/proxydhcp.restart pxe/bootinfo.restart \ pxe/GNUmakefile pxe/proxydhcp.restart pxe/bootinfo.restart \
security/GNUmakefile security/paperbag security/lastlog_daemon \ security/GNUmakefile security/paperbag security/lastlog_daemon \
security/plasticwrap \
tbsetup/GNUmakefile tbsetup/console_setup \ tbsetup/GNUmakefile tbsetup/console_setup \
tbsetup/console_reset tbsetup/bwconfig tbsetup/power_rpc27.pm \ tbsetup/console_reset tbsetup/bwconfig tbsetup/power_rpc27.pm \
tbsetup/os_load tbsetup/os_setup tbsetup/power \ tbsetup/os_load tbsetup/os_setup tbsetup/power \
......
...@@ -168,6 +168,7 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -168,6 +168,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
os/frisbee.redux/GNUmakefile \ os/frisbee.redux/GNUmakefile \
pxe/GNUmakefile pxe/proxydhcp.restart pxe/bootinfo.restart \ pxe/GNUmakefile pxe/proxydhcp.restart pxe/bootinfo.restart \
security/GNUmakefile security/paperbag security/lastlog_daemon \ security/GNUmakefile security/paperbag security/lastlog_daemon \
security/plasticwrap \
tbsetup/GNUmakefile tbsetup/console_setup \ tbsetup/GNUmakefile tbsetup/console_setup \
tbsetup/console_reset tbsetup/bwconfig tbsetup/power_rpc27.pm \ tbsetup/console_reset tbsetup/bwconfig tbsetup/power_rpc27.pm \
tbsetup/os_load tbsetup/os_setup tbsetup/power \ tbsetup/os_load tbsetup/os_setup tbsetup/power \
......
#!/usr/bin/perl #!/usr/bin/perl -w
#
# Configure variables
#
my $BOSSNODE = "@BOSSNODE@";
my $TBOPSEMAIL = "@TBOPSEMAIL@";
# Location of ssh program # Location of ssh program
if (-x "/usr/local/bin/ssh" ) { if (-x "/usr/local/bin/ssh" ) {
...@@ -6,11 +12,11 @@ if (-x "/usr/local/bin/ssh" ) { ...@@ -6,11 +12,11 @@ if (-x "/usr/local/bin/ssh" ) {
} elsif (-x "/usr/bin/ssh" ) { } elsif (-x "/usr/bin/ssh" ) {
$ssh = "/usr/bin/ssh"; $ssh = "/usr/bin/ssh";
} else { } else {
die "Unable to find ssh - please send mail to testbed-ops\@fast.cs.utah.edu\n"; die "Unable to find ssh - please send mail to $TBOPSEMAIL\n";
} }
# Remote host to connect to # Remote host to connect to
$host = "boss.emulab.net"; $host = $BOSSNODE;
# String to turn off password authentications # String to turn off password authentications
$nopass = "-o 'BatchMode yes'"; $nopass = "-o 'BatchMode yes'";
......
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