summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Watkins <daniel.watkins@canonical.com>2016-03-04 11:25:48 +0000
committerDaniel Watkins <daniel.watkins@canonical.com>2016-03-04 11:25:48 +0000
commitac7a4f3d961587edf18474b37cf139b7c1e368b8 (patch)
tree2fbd3e2289fa943605e7f0c8ce34d6f689e2d817
parentd4aa1ab6837a178e4efc79b4443b7609e50fa68f (diff)
parent921728d42731091f849d21dbef0920b84c559480 (diff)
downloadvyos-cloud-init-ac7a4f3d961587edf18474b37cf139b7c1e368b8.tar.gz
vyos-cloud-init-ac7a4f3d961587edf18474b37cf139b7c1e368b8.zip
Enable password changing via a hashed string
-rw-r--r--ChangeLog1
-rw-r--r--cloudinit/distros/__init__.py4
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f1f9f87..6a265047 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,7 @@
Support. [Sankar Tanguturi]
- timezone: use a symlink rather than copy for /etc/localtime
unless it is already a file (LP: #1543025).
+ - Enable password changing via a hashed string [Alex Sirbu]
0.7.6:
- open 0.7.6
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index 4bad8708..a73acae5 100644
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -393,6 +393,10 @@ class Distro(object):
if 'plain_text_passwd' in kwargs and kwargs['plain_text_passwd']:
self.set_passwd(name, kwargs['plain_text_passwd'])
+ # Set password if hashed password is provided and non-empty
+ if 'hashed_passwd' in kwargs and kwargs['hashed_passwd']:
+ self.set_passwd(name, kwargs['hashed_passwd'], hashed=True)
+
# Default locking down the account. 'lock_passwd' defaults to True.
# lock account unless lock_password is False.
if kwargs.get('lock_passwd', True):