Commit 6ec69da5 authored by Russ Fish's avatar Russ Fish
Browse files

Enable evproxy and progagent now that Elvin works on Windows XP.

parent 47d54b80
...@@ -22,12 +22,6 @@ $| = 1; ...@@ -22,12 +22,6 @@ $| = 1;
# Drag in path stuff so we can find emulab stuff. # Drag in path stuff so we can find emulab stuff.
BEGIN { require "/etc/emulab/paths.pm"; import emulabpaths; } BEGIN { require "/etc/emulab/paths.pm"; import emulabpaths; }
# Only root.
if ($EUID != 0) {
die("*** $0:\n".
" Must be root to run this script!\n");
}
# Script specific goo # Script specific goo
my $LOGFILE = "$LOGDIR/progagent.debug"; my $LOGFILE = "$LOGDIR/progagent.debug";
my $PIDFILE = "/var/run/progagent.pid"; my $PIDFILE = "/var/run/progagent.pid";
...@@ -42,6 +36,15 @@ use libsetup; ...@@ -42,6 +36,15 @@ use libsetup;
use libtmcc; use libtmcc;
use librc; use librc;
# This runs as a separate Local System service on XP. Change to root.
if (WINDOWS()) { $EUID = $UID = 0; }
# Only root.
if ($EUID != 0) {
die("*** $0:\n".
" Must be root to run this script!\n");
}
# #
# Not all clients support this. # Not all clients support this.
# #
......
...@@ -276,7 +276,7 @@ sub doboot() ...@@ -276,7 +276,7 @@ sub doboot()
# #
# Start the elvin proxy. # Start the elvin proxy.
# #
if (-x "$BINDIR/evproxy" && ! WINDOWS()) { if (-x "$BINDIR/evproxy") {
print("Starting elvin proxy daemon\n"); print("Starting elvin proxy daemon\n");
system("$BINDIR/evproxy -s event-server -e $pid/$eid"); system("$BINDIR/evproxy -s event-server -e $pid/$eid");
if ($?) { if ($?) {
......
...@@ -64,7 +64,8 @@ else ...@@ -64,7 +64,8 @@ else
# Last resort!!! tsshutdn # Last resort!!! tsshutdn
datehost="`date`: Host name '$hostname'" datehost="`date`: Host name '$hostname'"
msg="$datehost didn't /bin/shutdown changing to '$nodeid'! Trying tsshutdn." # msg="$datehost didn't /bin/shutdown changing to '$nodeid'! Trying tsshutdn."
msg="$datehost didn't reboot changing to '$nodeid'! Trying reboot."
echo "$msg" >> $logfile echo "$msg" >> $logfile
echo "$msg" echo "$msg"
tsshutdn 1 /REBOOT /DELAY:1 tsshutdn 1 /REBOOT /DELAY:1
...@@ -83,7 +84,7 @@ fi ...@@ -83,7 +84,7 @@ fi
netsh interface reset all netsh interface reset all
# Windows DHCP doesn't make a /etc/resolv.h, which tmcc needs for bossinfo. # Windows DHCP doesn't make a /etc/resolv.h, which tmcc needs for bossinfo.
# Make one from nslookup output. # Make one from ipconfig output.
ipconfig /all | awk \ ipconfig /all | awk \
'/^ *Connection-specific DNS Suffix/{print "search", $NF} \ '/^ *Connection-specific DNS Suffix/{print "search", $NF} \
/^ *DNS Servers/{print "nameserver", $NF}' > /etc/resolv.conf /^ *DNS Servers/{print "nameserver", $NF}' > /etc/resolv.conf
......
Supports Markdown
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