Commit eed09707 authored by Russ Fish's avatar Russ Fish

Tweaks.

parent 46d4fb75
......@@ -66,7 +66,7 @@ bin-install: dir-install
# Setx is run under CMD early in the user login to make HOME for Emacs.
$(INSTALL) -m 755 $(SRCDIR)/setx.exe $(SYSTEM32)/setx.exe
# Devcon is used by rc.cygwin and rc.ifc to disable/enable NIC's.
$(INSTALL) -m 755 $(SRCDIR)/setx.exe $(BINDIR)/devcon.exe
$(INSTALL) -m 755 $(SRCDIR)/devcon.exe $(BINDIR)/devcon.exe
# These are used by tmcd/findif.
$(INSTALL) -m 755 $(SYSTEM32)/getmac.exe $(BINDIR)/getmac.exe
$(INSTALL) -m 755 $(WBEM)/framedyn.dll $(BINDIR)/framedyn.dll
......
*** agetty-2.1-1/agetty.c.orig Thu Nov 7 10:55:57 2002
--- agetty-2.1-1/agetty.c Wed Jun 8 10:24:37 2005
***************
*** 1164,1170 ****
9600, B9600,
19200, B19200,
38400, B38400,
! #if defined(DIGI_EXT_BAUDS)
/* note: baud extensions all in 2nd nibble */
57600, B38400 | (1 << XC_BAUDSHIFT),
76800, B38400 | (2 << XC_BAUDSHIFT),
--- 1164,1176 ----
9600, B9600,
19200, B19200,
38400, B38400,
! #ifdef __CYGWIN__
! 57600, B57600,
! 115200, B115200,
! 128000, B128000,
! 230400, B230400,
! 256000, B256000,
! #elif defined(DIGI_EXT_BAUDS)
/* note: baud extensions all in 2nd nibble */
57600, B38400 | (1 << XC_BAUDSHIFT),
76800, B38400 | (2 << XC_BAUDSHIFT),
......@@ -252,7 +252,7 @@ sub os_ifconfig_line($$$$$$$;$$)
# "@PCI\VEN_8086&DEV_1010&SUBSYS_10128086&REV_01\5&2FA58B96&0&210030".
if (! open(DEVMAP, $XIMAP)) {
warning("Cannot open $XIMAP $!\n");
{
}
else {
while (my $dev_line = <DEVMAP>) {
chomp($dev_line);
......@@ -262,7 +262,6 @@ sub os_ifconfig_line($$$$$$$;$$)
close(DEVMAP);
}
}
print "dev_map '$dev_map'\n";
if ($inet ne "") {
$uplines .= sprintf($IFCONFIG, $iface, $inet, $mask);
......
......@@ -24,6 +24,19 @@ chmod -f g-w /etc/emulab
# Make sure there isn't a dangling slothd lock file.
rm -f /var/run/slothd.pid
# Get the desired node name from tmcc, and make sure we have a connection.
# There is a swap-in race condition where tmcc nodeid at first returns nothing.
nodeid=
while [ -z $nodeid ]; do
nodeid=`tmcc nodeid`
if [ -z $nodeid ]; then
msg="`date`: Null nodeid returned from tmcc. Trying again."
echo "$msg" >> $logfile
echo "$msg"
sleep 5
fi
done
# NetBT (Netbios over TCP) chatters, messes up slothd, and is not needed for
# SMB, so disable it. This doesn't take effect until TCP/IP is restarted, so
# do it before the computer name change below, which reboots the first time.
......@@ -36,18 +49,18 @@ for ifc in `regtool list $nbtif`; do
regtool set -i $nbtif/$ifc/DisableDynamicUpdate 1
done
# Make sure the computer name is right. Reboots to change it if necessary.
# There is a swap-in race condition where tmcc nodeid returns nothing.
nodeid=
while [ -z $nodeid ]; do
nodeid=`tmcc nodeid`
if [ -z $nodeid ]; then
msg="`date`: Null nodeid returned from tmcc. Trying again."
echo "$msg" >> $logfile
echo "$msg"
sleep 5
fi
done
# Turn on IP forwarding if there is more than one experimental net interface.
# Also requires a reboot to take effect.
tp=$svcs/Tcpip/Parameters
if [ `tmcc ifconfig | wc -l` \> 1 ]; then
regtool set -i $tp/IPEnableRouter 1
else
regtool set -i $tp/IPEnableRouter 0
fi
msg="IPEnableRouter set to `regtool get $tp/IPEnableRouter`"
echo "$msg" >> $logfile
echo "$msg"
hostname=`/bin/hostname`
datehost="`date`: Host name '$hostname'"
if [ $nodeid = $hostname ]; then
......@@ -55,7 +68,7 @@ if [ $nodeid = $hostname ]; then
echo "$msg" >> $logfile
echo "$msg"
else
msg="$datehost differs from nodeid '$nodeid'." >> $logfile
msg="$datehost differs from nodeid '$nodeid'."
echo "$msg" >> $logfile
echo "$msg"
......@@ -117,7 +130,7 @@ ipconfig /all | tr -d '\r' | awk \
# Set the primary domain, so the Windows resolver won't be confused when there are
# multiple interfaces.
domain=`tmcc bossinfo | sed -n 's/[^.]*\.\([^ ]*\) .*/\1/p'`
regtool set -s /HKLM/SYSTEM/CurrentControlSet/Services/Tcpip/Parameters/Domain $domain
regtool set -s $tp/Domain $domain
# Make sure all NIC's are up at the start, so they show up on ifconfig.
devcon enable =net 'PCI*'
......
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