cloud-init

Merge lp:~rcj/cloud-init/lock_passwd-doc-fix into lp:~cloud-init-dev/cloud-init/trunk

  1. lock_passwd-doc-fix
  2. Merge into trunk
Proposed by Robert C Jennings
Status: Merged
Merged at revision: 1161
Proposed branch: lp:~rcj/cloud-init/lock_passwd-doc-fix
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 29 lines (+3/-3)
1 file modified
doc/examples/cloud-config-user-groups.txt (+3/-3)
To merge this branch: bzr merge lp:~rcj/cloud-init/lock_passwd-doc-fix
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+284486@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/examples/cloud-config-user-groups.txt'
2--- doc/examples/cloud-config-user-groups.txt 2014-06-10 00:38:09 +0000
3+++ doc/examples/cloud-config-user-groups.txt 2016-01-29 17:49:16 +0000
4@@ -15,14 +15,14 @@
5 selinux-user: staff_u
6 expiredate: 2012-09-01
7 ssh-import-id: foobar
8- lock-passwd: false
9+ lock_passwd: false
10 passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/
11 - name: barfoo
12 gecos: Bar B. Foo
13 sudo: ALL=(ALL) NOPASSWD:ALL
14 groups: users, admin
15 ssh-import-id: None
16- lock-passwd: true
17+ lock_passwd: true
18 ssh-authorized-keys:
19 - <ssh pub key 1>
20 - <ssh pub key 2>
21@@ -42,7 +42,7 @@
22 # selinux-user: Optional. The SELinux user for the user's login, such as
23 # "staff_u". When this is omitted the system will select the default
24 # SELinux user.
25-# lock-passwd: Defaults to true. Lock the password to disable password login
26+# lock_passwd: Defaults to true. Lock the password to disable password login
27 # inactive: Create the user as inactive
28 # passwd: The hash -- not the password itself -- of the password you want
29 # to use for this user. You can generate a safe hash via: