Author: arkurth
Date: Fri Jul 7 21:28:57 2017
New Revision: 1801224
URL: http://svn.apache.org/viewvc?rev=1801224&view=rev
Log:
VCL-867
Added 'localhost' after -l argument to mkgroup and mkpasswd commands in
update_cygwin.cmd and cygwin-sshd-config.sh. This prevents the computer name
from being prepended in the output lines, a problem that seems to only be
exhibited after a computer is joined to Active Directory.
Modified:
vcl/trunk/managementnode/bin/cygwin-sshd-config.sh
vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd
Modified: vcl/trunk/managementnode/bin/cygwin-sshd-config.sh
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/bin/cygwin-sshd-config.sh?rev=1801224&r1=1801223&r2=1801224&view=diff
==============================================================================
--- vcl/trunk/managementnode/bin/cygwin-sshd-config.sh (original)
+++ vcl/trunk/managementnode/bin/cygwin-sshd-config.sh Fri Jul 7 21:28:57 2017
@@ -195,12 +195,12 @@ print_hr
# Recreate Cygwin's group and passwd files so they match current computer
accounts
echo Recreating /etc/group
-mkgroup -l > /etc/group
+mkgroup -l localhost > /etc/group
if [ $? -ne 0 ]; then die "failed to recreate /etc/group"; fi;
print_hr
echo Recreating /etc/passwd
-mkpasswd -l > /etc/passwd
+mkpasswd -l localhost > /etc/passwd
if [ $? -ne 0 ]; then die "failed to recreate /etc/passwd"; fi;
print_hr
@@ -364,6 +364,7 @@ taskkill.exe /F /FI "IMAGENAME eq cyg*"
taskkill.exe /F /FI "IMAGENAME eq bash*" 2>NUL
taskkill.exe /F /FI "IMAGENAME eq ssh*" 2>NUL
taskkill.exe /F /FI "IMAGENAME eq mintty*" 2>NUL
+taskkill.exe /F /FI "IMAGENAME eq sh.exe" 2>NUL
echo.
echo Waiting 3 seconds for processes to die
Modified: vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd?rev=1801224&r1=1801223&r2=1801224&view=diff
==============================================================================
--- vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd (original)
+++ vcl/trunk/managementnode/tools/Windows/Scripts/update_cygwin.cmd Fri Jul 7
21:28:57 2017
@@ -64,13 +64,13 @@ echo ERRORLEVEL: %ERRORLEVEL%
echo.
echo %TIME%: Creating new "group" file...
-C:\Cygwin\bin\mkgroup.exe -l > C:\Cygwin\etc\group
+C:\Cygwin\bin\mkgroup.exe -l localhost > C:\Cygwin\etc\group
echo ERRORLEVEL: %ERRORLEVEL%
set /A STATUS+=%ERRORLEVEL%
echo.
echo %TIME%: Creating new "passwd" file and changing root's primary group from
'None' to 'None'
-C:\Cygwin\bin\mkpasswd.exe -l | C:\Cygwin\bin\sed.exe -e
's/\(^root.*:\)513\(:.*\)/\1544\2/' > C:\Cygwin\etc\passwd
+C:\Cygwin\bin\mkpasswd.exe -l localhost | C:\Cygwin\bin\sed.exe -e
's/\(^root.*:\)513\(:.*\)/\1544\2/' > C:\Cygwin\etc\passwd
echo ERRORLEVEL: %ERRORLEVEL%
set /A STATUS+=%ERRORLEVEL%
echo.
