Merge branch 'release-1.11'

CHANGELOG.md

@@ -1,7 +1,11 @@
-## v1.11 (Planned)
+## v1.12 (Planned)
 
 * 
 
+## v1.11 (April 5th, 2014)
+
+* Change the default shell for OpenSSH from /bin/bash to /bin/sh (#45)
+
 ## v1.10 (March 18th, 2014)
 
 * Ensure WinRM service starts immediately rather than after 120 seconds (#43)

scripts/openssh.ps1

@@ -32,6 +32,11 @@ Write-Host "Setting SSH home directories"
     Foreach-Object { $_ -replace '/home/(\w+)', '/cygdrive/c/Users/$1' } |
     Set-Content 'C:\Program Files\OpenSSH\etc\passwd'
 
+# Set shell to /bin/sh to return exit status
+$passwd_file = Get-Content 'C:\Program Files\OpenSSH\etc\passwd'
+$passwd_file = $passwd_file -replace '/bin/bash', '/bin/sh'
+Set-Content 'C:\Program Files\OpenSSH\etc\passwd' $passwd_file
+
 # fix opensshd to not be strict
 Write-Host "Setting OpenSSH to be non-strict"
 $sshd_config = Get-Content "C:\Program Files\OpenSSH\etc\sshd_config"
@@ -74,4 +79,4 @@ netsh advfirewall firewall add rule name="ssh" dir=in action=allow protocol=TCP
 
 if ($AutoStart -eq $true) {
     Start-Service "OpenSSHd"
-}
+}