cloud-init/cloud-init-no-user-lock-if-already-locked.patch

Index: cloud-init-17.2/cloudinit/distros/__init__.py
===================================================================
--- cloud-init-17.2.orig/cloudinit/distros/__init__.py
+++ cloud-init-17.2/cloudinit/distros/__init__.py
@@ -551,8 +551,11 @@ class Distro(object):
             # about long names.
             util.subp(['passwd', '-l', name])
         except Exception as e:
-            util.logexc(LOG, 'Failed to disable password for user %s', name)
-            raise e
+            if e.exit_code != 3:
+                util.logexc(LOG, 'Failed to disable password for user %s', name)
+                raise e
+            else:
+                util.logexc(LOG, 'Password access already locked for user %s', name)
 
     def set_passwd(self, user, passwd, hashed=False):
         pass_string = '%s:%s' % (user, passwd)
- update cloud-init-sysconfig-netpathfix.patch: * skip checking for files in /etc/sysconfig that never exist on a wickedd based system OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=108 2018-02-16 14:24:07 +01:00			`Index: cloud-init-17.2/cloudinit/distros/__init__.py`
- add cloud-init-net-sysconfig-lp1665441.patch (lp#1665441) OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=80 2017-02-27 12:56:24 +01:00			`===================================================================`
- update cloud-init-sysconfig-netpathfix.patch: * skip checking for files in /etc/sysconfig that never exist on a wickedd based system OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=108 2018-02-16 14:24:07 +01:00			`--- cloud-init-17.2.orig/cloudinit/distros/__init__.py`
			`+++ cloud-init-17.2/cloudinit/distros/__init__.py`
			`@@ -551,8 +551,11 @@ class Distro(object):`
- users-groups module checks if the account is locked by calling 'passwd -l' which is ok but it should not raise if the account is already locked. This patch will cause lock_passwd to raise only if the account locking failed OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=25 2014-09-17 09:17:45 +02:00			`# about long names.`
			`util.subp(['passwd', '-l', name])`
			`except Exception as e:`
			`- util.logexc(LOG, 'Failed to disable password for user %s', name)`
			`- raise e`
			`+ if e.exit_code != 3:`
			`+ util.logexc(LOG, 'Failed to disable password for user %s', name)`
			`+ raise e`
			`+ else:`
			`+ util.logexc(LOG, 'Password access already locked for user %s', name)`

			`def set_passwd(self, user, passwd, hashed=False):`
			`pass_string = '%s:%s' % (user, passwd)`