From dbb3e8f11c53bc7173a060f7ffba102324fdf73b Mon Sep 17 00:00:00 2001 From: ranl Date: Tue, 25 Mar 2014 16:02:17 +0200 Subject: [PATCH 1/2] fix passing exit status from shell provisioner to packer --- scripts/openssh.ps1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/openssh.ps1 b/scripts/openssh.ps1 index d06bc3c9..0a428ec5 100644 --- a/scripts/openssh.ps1 +++ b/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" -} \ No newline at end of file +} From 403043a903e7099aee3706041cec731aa62f097b Mon Sep 17 00:00:00 2001 From: Joe Fitzgerald Date: Sat, 5 Apr 2014 16:59:42 -0600 Subject: [PATCH 2/2] Update CHANGELOG For v1.11 Release --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 882fa48c..6a129ec7 100644 --- a/CHANGELOG.md +++ b/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)