summaryrefslogtreecommitdiff
path: root/doc/examples
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-10-02 09:28:42 -0400
committerScott Moser <smoser@ubuntu.com>2013-10-02 09:28:42 -0400
commited8cb662f72e4e3e03ee0489593b7d114e5618cf (patch)
tree733c31db512febf2d5f5c6820dd7d7a29b1a9c7b /doc/examples
parentadbc9e73376cc7ef70455197f57aa41104eba7d6 (diff)
parentc8abc4a6dc53624809a1fcd065ac132678f376ef (diff)
downloadvyos-cloud-init-ed8cb662f72e4e3e03ee0489593b7d114e5618cf.tar.gz
vyos-cloud-init-ed8cb662f72e4e3e03ee0489593b7d114e5618cf.zip
examples/cloud-config-user-groups.txt doc fix, fix pep8
fix documentation of mkpasswd usage in doc/examples/cloud-config-user-groups.txt Also, Precise's version of pep8 insists on ordering of imports, but saucy's has not. So we had some incorrect ordering. This fixes './tools/run-pep8' on precise.
Diffstat (limited to 'doc/examples')
-rw-r--r--doc/examples/cloud-config-user-groups.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/examples/cloud-config-user-groups.txt b/doc/examples/cloud-config-user-groups.txt
index de5f321b..01548380 100644
--- a/doc/examples/cloud-config-user-groups.txt
+++ b/doc/examples/cloud-config-user-groups.txt
@@ -46,8 +46,8 @@ users:
# inactive: Create the user as inactive
# passwd: The hash -- not the password itself -- of the password you want
# to use for this user. You can generate a safe hash via:
-# mkpasswd -m SHA-512 -s 4096
-# (the above command would create a password SHA512 password hash
+# mkpasswd --method=SHA-512 --rounds=4096
+# (the above command would create from stdin an SHA-512 password hash
# with 4096 salt rounds)
#
# Please note: while the use of a hashed password is better than