summaryrefslogtreecommitdiff
path: root/cloudinit/distros/ubuntu.py
diff options
context:
space:
mode:
authorBen Howard <ben.howard@canonical.com>2012-08-20 15:39:39 -0600
committerBen Howard <ben.howard@canonical.com>2012-08-20 15:39:39 -0600
commit8aa59086146062fc767349be086fe0c35bf9c477 (patch)
tree7288ebad86ec5f16c2db17f2903df2d9a771769f /cloudinit/distros/ubuntu.py
parent336ddbe13bdfc729495f5bfb8cc89b4360916157 (diff)
downloadvyos-cloud-init-8aa59086146062fc767349be086fe0c35bf9c477.tar.gz
vyos-cloud-init-8aa59086146062fc767349be086fe0c35bf9c477.zip
Dropped hidden command; replaced with logstring. Also changed useradd command to use log options over short
Diffstat (limited to 'cloudinit/distros/ubuntu.py')
-rw-r--r--cloudinit/distros/ubuntu.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/distros/ubuntu.py b/cloudinit/distros/ubuntu.py
index e6672c4f..fbca5eb5 100644
--- a/cloudinit/distros/ubuntu.py
+++ b/cloudinit/distros/ubuntu.py
@@ -65,11 +65,12 @@ class Distro(debian.Distro):
'--home', '/home/%s' % self.__default_user_name__,
'--disabled-password',
'--gecos', 'Ubuntu',
- self.__default_user_name__,
+ self.__default_user_name__,
])
pass_string = '%(u)s:%(u)s' % {'u': self.__default_user_name__}
- util.subp(['chpasswd'], pass_string)
+ x_pass_string = '%(u)s:REDACTED' % {'u': self.__default_user_name__}
+ util.subp(['chpasswd'], pass_string, logstring=x_pass_string)
util.subp(['passwd', '-l', self.__default_user_name__])
ubuntu_sudoers="""