Hello community,
here is the log from the commit of package cloud-init for openSUSE:Factory
checked in at 2014-12-03 22:47:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cloud-init (Old)
and /work/SRC/openSUSE:Factory/.cloud-init.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloud-init"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes 2014-08-27
16:53:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cloud-init.new/cloud-init.changes
2014-12-03 22:48:21.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Nov 21 12:04:28 UTC 2014 - reik.keutterl...@nodefall.de
+
+- fixed syntax error in dmidecode on ppc64 patch
+
+-------------------------------------------------------------------
+Tue Sep 16 11:09:01 CEST 2014 - m...@suse.de
+
+- 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
+ cloud-init-no-user-lock-if-already-locked.patch
+
+-------------------------------------------------------------------
New:
----
cloud-init-no-user-lock-if-already-locked.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cloud-init.spec ++++++
--- /var/tmp/diff_new_pack.J0XWwe/_old 2014-12-03 22:48:23.000000000 +0100
+++ /var/tmp/diff_new_pack.J0XWwe/_new 2014-12-03 22:48:23.000000000 +0100
@@ -39,6 +39,7 @@
Patch7: suseSetInitCmd.patch
Patch8: cloudinit-datasources.patch
Patch9: cloud-init-no-dmidecode-on-ppc64.patch
+Patch10: cloud-init-no-user-lock-if-already-locked.patch
BuildRequires: fdupes
BuildRequires: filesystem
BuildRequires: python-devel
@@ -131,6 +132,7 @@
%patch7
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%if 0%{?suse_version} <= 1130
# disable ecdsa for SLE 11 (not available)
++++++ cloud-init-no-dmidecode-on-ppc64.patch ++++++
--- /var/tmp/diff_new_pack.J0XWwe/_old 2014-12-03 22:48:23.000000000 +0100
+++ /var/tmp/diff_new_pack.J0XWwe/_new 2014-12-03 22:48:23.000000000 +0100
@@ -20,7 +20,7 @@
uname_arch = os.uname()[4]
- if uname_arch.startswith("arm") or uname_arch == "aarch64":
-+ if uname_arch.startswith("arm") or uname_arch == "aarch64"
uname_arch.startswith("ppc"):
++ if uname_arch.startswith("arm") or uname_arch == "aarch64" or
uname_arch.startswith("ppc"):
# Disabling because dmidcode in dmi_data() crashes kvm process
LOG.debug("Disabling SmartOS datasource on arm (LP: #1243287)")
return False
++++++ cloud-init-no-user-lock-if-already-locked.patch ++++++
--- cloud-init-0.7.5/cloudinit/distros/__init__.py.orig 2014-09-16
11:00:52.192149797 +0200
+++ cloud-init-0.7.5/cloudinit/distros/__init__.py 2014-09-16
11:02:02.272874250 +0200
@@ -402,8 +402,11 @@
# 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)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
