Commit abbf91e0 authored by Russ Fish's avatar Russ Fish
Browse files

Minor CygWin setup script fixes.

parent 39b373ea
......@@ -62,7 +62,7 @@ bin-install: dir-install
# These are found in the /share/windows directory.
$(INSTALL) -m 755 $(SRCDIR)/WSName.exe $(BINDIR)/WSName.exe
$(INSTALL) -m 755 $(SRCDIR)/addusers.exe $(BINDIR)/addusers.exe
$(INSTALL) -m 755 $(SRCDIR)/addusers.exe $(BINDIR)/usrtogrp.exe
$(INSTALL) -m 755 $(SRCDIR)/usrtogrp.exe $(BINDIR)/usrtogrp.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
......@@ -9,9 +9,11 @@
# with value:
# C:\cygwin\bin\bash /usr/local/etc/emulab/rc/rc.cygwinxp-user
export PATH
# Root has a local home directory, and is handled by the SYSTEM sshd on port 22.
# There is no need to do any of the following for root.
user=`id -un`
if [ $user = root ]; then
exit 0
......@@ -46,7 +46,7 @@ chmod o-r /etc/ssh*key.user
# Start sshd in the background, orphaned so it doesn't get SIGINT from here.
# The pidfile is updated by sshd itself.
# Don't use privilege separation, because it requires taking ownership of
# Don't use privilege separation here, because it requires taking ownership of
# /var/empty, which kills key exchange for the SYSTEM root sshd.
echo "Starting new sshd daemon as $user."
(CYGWIN="ntsec tty" /usr/sbin/sshd -p 2222 -o "UsePrivilegeSeparation no" \
......@@ -54,6 +54,6 @@ echo "Starting new sshd daemon as $user."
sleep 2
# Remember this one separately from the SYSTEM sshd.
chmod -f g+w $upidfile
chmod -f g+w $upidfile >& /dev/null
cp $pidfile $upidfile
chmod -f g+w $upidfile
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