1
diff --git a/cloudinit/config/cc_resizefs.py b/cloudinit/config/cc_resizefs.py
2
index cec22bb..431f495 100644
3
--- a/cloudinit/config/cc_resizefs.py
4
+++ b/cloudinit/config/cc_resizefs.py
5
@@ -81,7 +81,7 @@ def _resize_xfs(mount_point, devpth):
6
81
81
7
82
82
8
83
def _resize_ufs(mount_point, devpth):
83
def _resize_ufs(mount_point, devpth):
10
84
    return ('growfs', devpth)
84
    return ('growfs', '-y', devpth)
11
85
85
12
86
86
13
87
def _get_dumpfs_output(mount_point):
87
def _get_dumpfs_output(mount_point):
14
diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py
15
index bb24d57..886f952 100755
16
--- a/cloudinit/config/cc_set_passwords.py
17
+++ b/cloudinit/config/cc_set_passwords.py
18
@@ -134,24 +134,50 @@ def handle(_name, cfg, cloud, log, args):
19
134
134
20
135
        ch_in = '\n'.join(plist_in) + '\n'
135
        ch_in = '\n'.join(plist_in) + '\n'
21
136
        if users:
136
        if users:
29
137
            try:
137
            if util.is_FreeBSD():
30
138
                log.debug("Changing password for %s:", users)
138
                for line in plist_in:
31
139
                util.subp(['chpasswd'], ch_in)
139
                    u, p = line.split(':', 1)
32
140
            except Exception as e:
140
                    try:
33
141
                errors.append(e)
141
                        log.debug("Changing password for %s:", u)
34
142
                util.logexc(
142
                        util.subp(['pw', 'usermod', u, '-h', '0'], data=p)
35
143
                    log, "Failed to set passwords with chpasswd for %s", users)
143
                    except Exception as e:
36
144
                        errors.append(e)
37
145
                        util.logexc(log,
38
146
                                    "Failed to set passwords with"
39
147
                                    " 'pw usermod -h 0' for %s", u)
40
148
            else:
41
149
                try:
42
150
                    log.debug("Changing password for %s:", users)
43
151
                    util.subp(['chpasswd'], ch_in)
44
152
                except Exception as e:
45
153
                    errors.append(e)
46
154
                    util.logexc(log,
47
155
                                "Failed to set passwords with chpasswd"
48
156
                                " for %s", users)
49
144
157
50
145
        hashed_ch_in = '\n'.join(hashed_plist_in) + '\n'
158
        hashed_ch_in = '\n'.join(hashed_plist_in) + '\n'
51
146
        if hashed_users:
159
        if hashed_users:
60
147
            try:
160
            if util.is_FreeBSD():
61
148
                log.debug("Setting hashed password for %s:", hashed_users)
161
                for line in hashed_plist_in:
62
149
                util.subp(['chpasswd', '-e'], hashed_ch_in)
162
                    u, p = line.split(':', 1)
63
150
            except Exception as e:
163
                    try:
64
151
                errors.append(e)
164
                        log.debug("Changing password for %s:", u)
65
152
                util.logexc(
165
                        util.subp(['pw', 'usermod', u, '-H', '0'], data=p)
66
153
                    log, "Failed to set hashed passwords with chpasswd for %s",
166
                    except Exception as e:
67
154
                    hashed_users)
167
                        errors.append(e)
68
168
                        util.logexc(log,
69
169
                                    "Failed to set passwords with"
70
170
                                    " 'pw usermod -H 0' for %s", u)
71
171
            else:
72
172
                try:
73
173
                    log.debug("Setting hashed password for %s:", hashed_users)
74
174
                    util.subp(['chpasswd', '-e'], hashed_ch_in)
75
175
                except Exception as e:
76
176
                    errors.append(e)
77
177
                    util.logexc(log,
78
178
                                "Failed to set hashed passwords"
79
179
                                " with chpasswd for %s",
80
180
                                hashed_users)
81
155
181
82
156
        if len(randlist):
182
        if len(randlist):
83
157
            blurb = ("Set the following 'random' passwords\n",
183
            blurb = ("Set the following 'random' passwords\n",
84
@@ -162,7 +188,11 @@ def handle(_name, cfg, cloud, log, args):
85
162
            expired_users = []
188
            expired_users = []
86
163
            for u in users:
189
            for u in users:
87
164
                try:
190
                try:
89
165
                    util.subp(['passwd', '--expire', u])
191
                    if util.is_FreeBSD():
90
192
                        util.subp(['pw', 'usermod', u, '-p', '+1s'])
91
193
                    else:
92
194
                        util.subp(['passwd', '--expire', u])
93
195
94
166
                    expired_users.append(u)
196
                    expired_users.append(u)
95
167
                except Exception as e:
197
                except Exception as e:
96
168
                    errors.append(e)
198
                    errors.append(e)
Status:	Work in progress
Proposed branch:	~harrykas/cloud-init:freebsd_improvement
Merge into:	cloud-init:master
Diff against target:	96 lines (+47/-17) 2 files modified cloudinit/config/cc_resizefs.py (+1/-1) cloudinit/config/cc_set_passwords.py (+46/-16)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Scott Moser			Needs Fixing on 2018-03-15
Server Team CI bot	continuous-integration	2018-02-15	Approve on 2018-02-16
Review via email: mp+337761@code.launchpad.net