Commit ecc94644 authored by Leigh Stoller's avatar Leigh Stoller

An assortment of minor changes for the new IP layout.

parent bf692fb2
......@@ -2,11 +2,11 @@
#
# Split up an image and imagezip it. Beware, the sector offsets and sizes
# are hardcoded in here.
# are mhardcoded in here.
#
image=wd0
zip=imagezip
zip=/q/testbed/image/imagezip
#
# Boot block: start 0, size 63
......
......@@ -14,46 +14,46 @@
#
# IP address Action
#
155.99.214.101 part=2
155.99.214.102 part=2
155.99.214.103 file=155.99.214.74:/tftpboot/netboot
155.99.214.104 part=2
155.99.214.105 part=2
155.99.214.106 part=2
155.99.214.107 part=2
155.99.214.108 part=2
155.99.214.109 part=1
155.99.214.110 part=2
155.101.132.101 part=2
155.101.132.2 part=2
155.101.132.3 file=155.101.132.74:/tftpboot/netboot
155.101.132.4 part=2
155.101.132.5 part=2
155.101.132.6 part=2
155.101.132.7 part=2
155.101.132.8 part=2
155.101.132.9 part=1
155.101.132.10 part=2
155.99.214.111 part=2
155.99.214.112 part=2
155.99.214.113 part=2
155.99.214.114 part=2
155.99.214.115 part=2
155.99.214.116 part=2
155.99.214.117 part=2
155.99.214.118 part=2
155.99.214.119 part=2
155.99.214.120 part=2
155.101.132.11 part=2
155.101.132.12 part=2
155.101.132.13 part=2
155.101.132.14 part=2
155.101.132.15 part=2
155.101.132.16 part=2
155.101.132.17 part=2
155.101.132.18 part=2
155.101.132.19 part=2
155.101.132.20 part=2
155.99.214.121 part=2
155.99.214.122 part=2
155.99.214.123 part=2
155.99.214.124 part=2
155.99.214.125 part=2
155.99.214.126 part=2
155.99.214.127 part=2
155.99.214.128 part=2
155.99.214.129 part=2
155.99.214.130 part=2
155.101.132.21 part=2
155.101.132.22 part=2
155.101.132.23 part=2
155.101.132.24 part=2
155.101.132.25 part=2
155.101.132.26 part=2
155.101.132.27 part=2
155.101.132.28 part=2
155.101.132.29 part=2
155.101.132.30 part=2
155.99.214.131 part=2
155.99.214.132 part=2
155.99.214.133 part=2
155.99.214.134 part=2
155.99.214.135 part=2
155.99.214.136 part=2
155.99.214.137 part=2
155.99.214.138 part=2
155.99.214.139 part=2
155.99.214.140 part=2
155.101.132.31 part=2
155.101.132.32 part=2
155.101.132.33 part=2
155.101.132.34 part=2
155.101.132.35 part=2
155.101.132.36 part=2
155.101.132.37 part=2
155.101.132.38 part=2
155.101.132.39 part=2
155.101.132.40 part=2
# This is a comment.
# Client IP TFTPD IP File to boot
# (paper)
#
155.99.214.101 155.99.214.70 /tftpboot/pxeboot
155.99.214.102 155.99.214.70 /tftpboot/pxeboot
155.99.214.103 155.99.214.70 /tftpboot/pxeboot
155.99.214.104 155.99.214.70 /tftpboot/pxeboot
155.99.214.105 155.99.214.70 /tftpboot/pxeboot
155.99.214.106 155.99.214.70 /tftpboot/pxeboot
155.99.214.107 155.99.214.70 /tftpboot/pxeboot
155.99.214.108 155.99.214.70 /tftpboot/pxeboot
155.99.214.109 155.99.214.70 /tftpboot/pxeboot
155.99.214.110 155.99.214.70 /tftpboot/pxeboot
155.99.214.111 155.99.214.70 /tftpboot/pxeboot
155.99.214.112 155.99.214.70 /tftpboot/pxeboot
155.99.214.113 155.99.214.70 /tftpboot/pxeboot
155.99.214.114 155.99.214.70 /tftpboot/pxeboot
155.99.214.115 155.99.214.70 /tftpboot/pxeboot
155.99.214.116 155.99.214.70 /tftpboot/pxeboot
155.99.214.117 155.99.214.70 /tftpboot/pxeboot
155.99.214.118 155.99.214.70 /tftpboot/pxeboot
155.99.214.119 155.99.214.70 /tftpboot/pxeboot
155.99.214.120 155.99.214.70 /tftpboot/pxeboot
155.99.214.121 155.99.214.70 /tftpboot/pxeboot
155.99.214.122 155.99.214.70 /tftpboot/pxeboot
155.99.214.123 155.99.214.70 /tftpboot/pxeboot
155.99.214.124 155.99.214.70 /tftpboot/pxeboot
155.99.214.125 155.99.214.70 /tftpboot/pxeboot
155.99.214.126 155.99.214.70 /tftpboot/pxeboot
155.99.214.127 155.99.214.70 /tftpboot/pxeboot
155.99.214.128 155.99.214.70 /tftpboot/pxeboot
155.99.214.129 155.99.214.70 /tftpboot/pxeboot
155.99.214.130 155.99.214.70 /tftpboot/pxeboot
155.99.214.131 155.99.214.70 /tftpboot/pxeboot
155.99.214.132 155.99.214.70 /tftpboot/pxeboot
155.99.214.133 155.99.214.70 /tftpboot/pxeboot
155.99.214.134 155.99.214.70 /tftpboot/pxeboot
155.99.214.135 155.99.214.70 /tftpboot/pxeboot
155.99.214.136 155.99.214.70 /tftpboot/pxeboot
155.99.214.137 155.99.214.70 /tftpboot/pxeboot
155.99.214.138 155.99.214.70 /tftpboot/pxeboot
155.99.214.139 155.99.214.70 /tftpboot/pxeboot
155.99.214.140 155.99.214.70 /tftpboot/pxeboot
155.101.132.101 155.101.128.70 /tftpboot/pxeboot
155.101.132.2 155.101.128.70 /tftpboot/pxeboot
155.101.132.3 155.101.128.70 /tftpboot/pxeboot
155.101.132.4 155.101.128.70 /tftpboot/pxeboot
155.101.132.5 155.101.128.70 /tftpboot/pxeboot
155.101.132.6 155.101.128.70 /tftpboot/pxeboot
155.101.132.7 155.101.128.70 /tftpboot/pxeboot
155.101.132.8 155.101.128.70 /tftpboot/pxeboot
155.101.132.9 155.101.128.70 /tftpboot/pxeboot
155.101.132.10 155.101.128.70 /tftpboot/pxeboot
155.101.132.11 155.101.128.70 /tftpboot/pxeboot
155.101.132.12 155.101.128.70 /tftpboot/pxeboot
155.101.132.13 155.101.128.70 /tftpboot/pxeboot
155.101.132.14 155.101.128.70 /tftpboot/pxeboot
155.101.132.15 155.101.128.70 /tftpboot/pxeboot
155.101.132.16 155.101.128.70 /tftpboot/pxeboot
155.101.132.17 155.101.128.70 /tftpboot/pxeboot
155.101.132.18 155.101.128.70 /tftpboot/pxeboot
155.101.132.19 155.101.128.70 /tftpboot/pxeboot
155.101.132.20 155.101.128.70 /tftpboot/pxeboot
155.101.132.21 155.101.128.70 /tftpboot/pxeboot
155.101.132.22 155.101.128.70 /tftpboot/pxeboot
155.101.132.23 155.101.128.70 /tftpboot/pxeboot
155.101.132.24 155.101.128.70 /tftpboot/pxeboot
155.101.132.25 155.101.128.70 /tftpboot/pxeboot
155.101.132.26 155.101.128.70 /tftpboot/pxeboot
155.101.132.27 155.101.128.70 /tftpboot/pxeboot
155.101.132.28 155.101.128.70 /tftpboot/pxeboot
155.101.132.29 155.101.128.70 /tftpboot/pxeboot
155.101.132.30 155.101.128.70 /tftpboot/pxeboot
155.101.132.31 155.101.128.70 /tftpboot/pxeboot
155.101.132.32 155.101.128.70 /tftpboot/pxeboot
155.101.132.33 155.101.128.70 /tftpboot/pxeboot
155.101.132.34 155.101.128.70 /tftpboot/pxeboot
155.101.132.35 155.101.128.70 /tftpboot/pxeboot
155.101.132.36 155.101.128.70 /tftpboot/pxeboot
155.101.132.37 155.101.128.70 /tftpboot/pxeboot
155.101.132.38 155.101.128.70 /tftpboot/pxeboot
155.101.132.39 155.101.128.70 /tftpboot/pxeboot
155.101.132.40 155.101.128.70 /tftpboot/pxeboot
......@@ -4,7 +4,7 @@
$ssh = "/usr/local/bin/ssh";
# Remote host to connect to
$host = "paper.cs.utah.edu";
$host = "paper.emulab.net";
# String to turn off password authentications
$nopass = "-o 'BatchMode yes'";
......
......@@ -11,7 +11,7 @@ use English;
my $TB = "@prefix@";
my $DBNAME = "@TBDBNAME@";
my $SSH = "sshtb -q -l root plastic.cs.utah.edu";
my $SSH = "sshtb -q -l root plastic.emulab.net";
my $PROG = "$TB/sbin/console_setup.proxy";
my $TBPID = "flux";
my $dbg = 1;
......
......@@ -35,8 +35,8 @@ my $DBNAME = "@TBDBNAME@";
my $rsh = "sshtb -q";
my $ssh = "sshtb -q";
my $NETDISK = "/tftpboot/netdisk";
my $PAPERADDR = "155.99.214.70";
my $PLASTICADDR = "155.99.214.74";
my $PAPERADDR = "paper.emulab.net";
my $PLASTICADDR = "plastic.emulab.net";
my $power = "$TB/bin/power";
my $ping = "/sbin/ping";
my $dbg = 1;
......
#!/usr/local/bin/perl -wT
### $Id: rmacct-ctrl.in,v 1.1 2001-01-04 01:17:09 stoller Exp $
### $Id: rmacct-ctrl.in,v 1.2 2001-02-06 16:46:43 stoller Exp $
use English;
use Mysql;
......@@ -16,6 +16,7 @@ my $me; # alphanumeric username of $UID
my $USERROOT = "/users";
my $YES = "YES";
my $NO = "NO";
my $CONTROL = "users.emulab.net";
my $user; # kwright
my $project = 0; # lkwbox
......@@ -122,7 +123,7 @@ sub dowork() {
# print "No control node for project $project in database.\n";
}
}
$control_node = "plastic"; # see note above.
$control_node = $CONTROL; # see note above.
# I assume FreeBSD. Its
# firmly entrenched as our control node OS. -lkw
......
......@@ -26,7 +26,7 @@ delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
my $PROJROOT = "/proj";
my $dbh = Mysql->connect("localhost",$DBNAME,"script","none");
my $db_result= "";
my $control_node = "plastic";
my $control_node = "plastic.emulab.net";
#
# Check args.
......
......@@ -26,8 +26,6 @@ my $DBNAME = "@TBDBNAME@";
my $rsh = "sshtb -q";
my $ssh = "sshtb -q";
my $NETDISK = "/tftpboot/netdisk";
my $PAPERADDR = "155.99.214.70";
my $PLASTICADDR = "155.99.214.74";
my $power = "$TB/power";
my $osload = "$TB/os_load";
my $ping = "/sbin/ping";
......
......@@ -24,7 +24,7 @@ my $IFACE = "fxp";
my $CTLIFACE = "fxp4";
my $project = "";
my $PROJDIR = "/proj";
my $MOUNTCMD = "/sbin/mount 155.99.214.74:/q/proj/";
my $MOUNTCMD = "/sbin/mount fs.emulab.net:/q/proj/";
#
# This is a debugging thing for my home network.
......
......@@ -25,7 +25,7 @@ my $IFACE = "eth";
my $CTLIFACE = "eth4";
my $project = "";
my $PROJDIR = "/proj";
my $MOUNTCMD = "/bin/mount 155.99.214.74:/q/proj/";
my $MOUNTCMD = "/bin/mount fs.emulab.net:/q/proj/";
#
# This is a debugging thing for my home network.
......
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