From 8172d7725fbaaeec60e171096ad6f1853b2cbbe8 Mon Sep 17 00:00:00 2001 From: Eric Nordlund Date: Tue, 1 Oct 2013 12:56:27 -0700 Subject: Fix typo in mkpasswd command: '-s' was used instead of '-R' for salt rounds. Remove duplicate 'password' text. --- doc/examples/cloud-config-user-groups.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 doc/examples/cloud-config-user-groups.txt (limited to 'doc') diff --git a/doc/examples/cloud-config-user-groups.txt b/doc/examples/cloud-config-user-groups.txt old mode 100644 new mode 100755 index de5f321b..ad341005 --- 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 -m SHA-512 -R 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 -- cgit v1.2.3 From fee4bb00a51d591942a79443d0721742c0f4bf04 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 2 Oct 2013 09:23:59 -0400 Subject: use long format args rather than short --- doc/examples/cloud-config-user-groups.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/examples/cloud-config-user-groups.txt b/doc/examples/cloud-config-user-groups.txt index ad341005..01548380 100755 --- a/doc/examples/cloud-config-user-groups.txt +++ b/doc/examples/cloud-config-user-groups.txt @@ -46,7 +46,7 @@ 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 -R 4096 +# mkpasswd --method=SHA-512 --rounds=4096 # (the above command would create from stdin an SHA-512 password hash # with 4096 salt rounds) # -- cgit v1.2.3 From c8abc4a6dc53624809a1fcd065ac132678f376ef Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 2 Oct 2013 09:25:36 -0400 Subject: fix permission changes --- cloudinit/config/cc_disk_setup.py | 0 doc/examples/cloud-config-user-groups.txt | 0 tests/unittests/test_datasource/test_azure.py | 0 tests/unittests/test_datasource/test_opennebula.py | 0 tests/unittests/test_handler/test_handler_seed_random.py | 0 tests/unittests/test_userdata.py | 0 tests/unittests/test_util.py | 0 7 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 cloudinit/config/cc_disk_setup.py mode change 100755 => 100644 doc/examples/cloud-config-user-groups.txt mode change 100755 => 100644 tests/unittests/test_datasource/test_azure.py mode change 100755 => 100644 tests/unittests/test_datasource/test_opennebula.py mode change 100755 => 100644 tests/unittests/test_handler/test_handler_seed_random.py mode change 100755 => 100644 tests/unittests/test_userdata.py mode change 100755 => 100644 tests/unittests/test_util.py (limited to 'doc') diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py old mode 100755 new mode 100644 diff --git a/doc/examples/cloud-config-user-groups.txt b/doc/examples/cloud-config-user-groups.txt old mode 100755 new mode 100644 diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py old mode 100755 new mode 100644 diff --git a/tests/unittests/test_datasource/test_opennebula.py b/tests/unittests/test_datasource/test_opennebula.py old mode 100755 new mode 100644 diff --git a/tests/unittests/test_handler/test_handler_seed_random.py b/tests/unittests/test_handler/test_handler_seed_random.py old mode 100755 new mode 100644 diff --git a/tests/unittests/test_userdata.py b/tests/unittests/test_userdata.py old mode 100755 new mode 100644 diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py old mode 100755 new mode 100644 -- cgit v1.2.3