This is an automated email from the ASF dual-hosted git repository.
jfthomps pushed a commit to branch VCL-1127_updates_for_cygsshd
in repository https://gitbox.apache.org/repos/asf/vcl.git
The following commit(s) were added to refs/heads/VCL-1127_updates_for_cygsshd
by this push:
new e1d7e13 VCL-1127 - Make changes to handle Cygwin's change of sshd
service name to cygsshd
e1d7e13 is described below
commit e1d7e13127cd8cbb2ed5333e9e7093e93101412f
Author: Josh Thompson <[email protected]>
AuthorDate: Thu Jun 11 17:00:11 2020 -0400
VCL-1127 - Make changes to handle Cygwin's change of sshd service name to
cygsshd
update_cygwin.cmd: modified line that determines name for ssh service -
added spaces after '=' for arguments, without the spaces, Windows gives a weird
1060 error
gen-node-key.sh: modified line that determines name for ssh service - added
spaces after '=' for arguments, without the spaces, Windows gives a weird 1060
error
---
managementnode/bin/gen-node-key.sh | 2 +-
managementnode/tools/Windows/Scripts/update_cygwin.cmd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/managementnode/bin/gen-node-key.sh
b/managementnode/bin/gen-node-key.sh
index 8feb0f3..370e14b 100755
--- a/managementnode/bin/gen-node-key.sh
+++ b/managementnode/bin/gen-node-key.sh
@@ -153,7 +153,7 @@ esac
# if OS is CYGWIN, try to determine sshd service name
if [[ $OS =~ (CYGWIN) ]]; then
- sshdservice=`ssh $SSH_OPTIONS -i $KEY_PATH root@$NODE "sc queryex
type=service state=all | grep sshd | grep SERVICE_NAME | awk '{print \\$2}' |
sed 's/
//g'"`
+ sshdservice=`ssh $SSH_OPTIONS -i $KEY_PATH root@$NODE "sc queryex type=
service state= all | grep sshd | grep SERVICE_NAME | awk '{print \\$2}' | sed
's/
//g'"`
if [[ $sshdservice != "" && $sshdservice != "sshd" ]]; then
echo "Detected CYGWIN with alternate sshd service name:
$sshdservice"
SSHSTOP="net stop $sshdservice"
diff --git a/managementnode/tools/Windows/Scripts/update_cygwin.cmd
b/managementnode/tools/Windows/Scripts/update_cygwin.cmd
index 8c0d093..64d854a 100755
--- a/managementnode/tools/Windows/Scripts/update_cygwin.cmd
+++ b/managementnode/tools/Windows/Scripts/update_cygwin.cmd
@@ -172,7 +172,7 @@ echo.
echo ----------------------------------------------------------------------
-sc queryex type=service state=all | findstr "cygsshd" > nul && SET
sshdservice=cygsshd || SET sshdservice=sshd
+sc queryex type= service state= all | findstr "cygsshd" > nul && SET
sshdservice=cygsshd || SET sshdservice=sshd
echo %TIME%: Setting sshd service startup mode to auto...
"%SystemRoot%\System32\sc.exe" config %sshdservice% start= auto 2>&1
