Merge lp:~hazmat/juju-core/manual-bash-user into lp:~go-bot/juju-core/trunk
Proposed by
Kapil Thangavelu
Status: | Merged |
---|---|
Approved by: | Kapil Thangavelu |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2663 |
Proposed branch: | lp:~hazmat/juju-core/manual-bash-user |
Merge into: | lp:~go-bot/juju-core/trunk |
Diff against target: |
12 lines (+1/-1) 1 file modified
environs/manual/init.go (+1/-1) |
To merge this branch: | bzr merge lp:~hazmat/juju-core/manual-bash-user |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+216746@code.launchpad.net |
Commit message
manual provider shell for created ubuntu user is bash
Description of the change
shell for created ubuntu user is bash
normalize shell when manual provider is creating ubuntu user to be bash.
To post a comment you must log in.
Reviewers: mp+216746_ code.launchpad. net,
Message:
Please take a look.
Description:
shell for created ubuntu user is bash
normalize shell when manual provider is creating ubuntu user to be bash.
https:/ /code.launchpad .net/~hazmat/ juju-core/ manual- bash-user/ +merge/ 216746
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/90160045/
Affected files (+3, -1 lines): manual/ init.go
A [revision details]
M environs/
Index: [revision details] 20140421110750- ijhvsrnn2fb1hhq 2
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-
+New revision: <email address hidden>
Index: environs/ manual/ init.go manual/ init.go' manual/ init.go 2014-03-18 23:44:18 +0000 manual/ init.go 2014-04-22 13:53:50 +0000
=== modified file 'environs/
--- environs/
+++ environs/
@@ -176,7 +176,7 @@
const initUbuntuScript = `
set -e
-(id ubuntu &> /dev/null) || useradd -m ubuntu
+(id ubuntu &> /dev/null) || useradd -m ubuntu -s /bin/bash
umask 0077
temp=$(mktemp)
echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' > $temp