Stop calling ``udevadm settle'' with --quiet since systemd 213 removed it
This commit is contained in:
parent
b30bf1efd3
commit
a4207cd56e
13
cloud-init-0.7.5-udevadm-quiet.patch
Normal file
13
cloud-init-0.7.5-udevadm-quiet.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: cloud-init-0.7.5/cloudinit/sources/DataSourceAltCloud.py
|
||||||
|
===================================================================
|
||||||
|
--- cloud-init-0.7.5.orig/cloudinit/sources/DataSourceAltCloud.py
|
||||||
|
+++ cloud-init-0.7.5/cloudinit/sources/DataSourceAltCloud.py
|
||||||
|
@@ -42,7 +42,7 @@ CLOUD_INFO_FILE = '/etc/sysconfig/cloud-
|
||||||
|
# Shell command lists
|
||||||
|
CMD_DMI_SYSTEM = ['/usr/sbin/dmidecode', '--string', 'system-product-name']
|
||||||
|
CMD_PROBE_FLOPPY = ['/sbin/modprobe', 'floppy']
|
||||||
|
-CMD_UDEVADM_SETTLE = ['/sbin/udevadm', 'settle', '--quiet', '--timeout=5']
|
||||||
|
+CMD_UDEVADM_SETTLE = ['/sbin/udevadm', 'settle', '--timeout=5']
|
||||||
|
|
||||||
|
META_DATA_NOT_SUPPORTED = {
|
||||||
|
'block-device-mapping': {},
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
Name: cloud-init
|
Name: cloud-init
|
||||||
Version: 0.7.5
|
Version: 0.7.5
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: Cloud instance init scripts
|
Summary: Cloud instance init scripts
|
||||||
|
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
@ -25,6 +25,9 @@ Patch0: cloud-init-0.7.5-fedora.patch
|
|||||||
# https://code.launchpad.net/~gholms/cloud-init/rsyslog-programname/+merge/186906
|
# https://code.launchpad.net/~gholms/cloud-init/rsyslog-programname/+merge/186906
|
||||||
Patch1: cloud-init-0.7.5-rsyslog-programname.patch
|
Patch1: cloud-init-0.7.5-rsyslog-programname.patch
|
||||||
|
|
||||||
|
# Systemd 213 removed the --quiet option from ``udevadm settle''
|
||||||
|
Patch2: cloud-init-0.7.5-udevadm-quiet.patch
|
||||||
|
|
||||||
# Deal with noarch -> arch
|
# Deal with noarch -> arch
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1067089
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1067089
|
||||||
Obsoletes: cloud-init < 0.7.5-3
|
Obsoletes: cloud-init < 0.7.5-3
|
||||||
@ -67,6 +70,7 @@ ssh keys and to let the user run various scripts.
|
|||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
cp -p %{SOURCE2} README.fedora
|
cp -p %{SOURCE2} README.fedora
|
||||||
|
|
||||||
@ -156,6 +160,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 9 2014 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.5-5
|
||||||
|
- Stopped calling ``udevadm settle'' with --quiet since systemd 213 removed it
|
||||||
|
|
||||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.5-4
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.5-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user