diff --git a/cloud-init-0.7.6-bzr1060-network-online.patch b/cloud-init-0.7.6-bzr1060-network-online.patch deleted file mode 100644 index 5b5983a..0000000 --- a/cloud-init-0.7.6-bzr1060-network-online.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: cloud-init-0.7.6-bzr1060/systemd/cloud-config.service -=================================================================== ---- cloud-init-0.7.6-bzr1060.orig/systemd/cloud-config.service -+++ cloud-init-0.7.6-bzr1060/systemd/cloud-config.service -@@ -1,8 +1,8 @@ - [Unit] - Description=Apply the settings specified in cloud-config --After=network.target syslog.target cloud-config.target -+After=network-online.target syslog.target cloud-config.target - Requires=cloud-config.target --Wants=network.target -+Wants=network-online.target - - [Service] - Type=oneshot -Index: cloud-init-0.7.6-bzr1060/systemd/cloud-init.service -=================================================================== ---- cloud-init-0.7.6-bzr1060.orig/systemd/cloud-init.service -+++ cloud-init-0.7.6-bzr1060/systemd/cloud-init.service -@@ -1,8 +1,8 @@ - [Unit] - Description=Initial cloud-init job (metadata service crawler) --After=local-fs.target network.target cloud-init-local.service -+After=local-fs.target network-online.target cloud-init-local.service - Before=sshd.service sshd-keygen.service systemd-user-sessions.service --Requires=network.target -+Requires=network-online.target - Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service - - [Service] -Index: cloud-init-0.7.6-bzr1060/systemd/cloud-final.service -=================================================================== ---- cloud-init-0.7.6-bzr1060.orig/systemd/cloud-final.service -+++ cloud-init-0.7.6-bzr1060/systemd/cloud-final.service -@@ -1,8 +1,8 @@ - [Unit] - Description=Execute cloud user/final scripts --After=network.target syslog.target cloud-config.service rc-local.service -+After=network-online.target syslog.target cloud-config.service rc-local.service - Requires=cloud-config.target --Wants=network.target -+Wants=network-online.target - - [Service] - Type=oneshot diff --git a/cloud-init.spec b/cloud-init.spec index de195b8..9b7e25a 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -2,15 +2,15 @@ Name: cloud-init Version: 0.7.6 -Release: 5.20140218bzr1060%{?dist} +Release: 6.20150813bzr1137%{?dist} Summary: Cloud instance init scripts Group: System Environment/Base License: GPLv3 URL: http://launchpad.net/cloud-init #Source0: https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz -# bzr export -r 1060 cloud-init-0.7.6-bzr1060.tar.gz lp:cloud-init -Source0: cloud-init-0.7.6-bzr1060.tar.gz +# bzr export -r 1137 cloud-init-0.7.6-bzr1137.tar.gz lp:cloud-init +Source0: cloud-init-0.7.6-bzr1137.tar.gz Source1: cloud-init-fedora.cfg Source2: cloud-init-README.fedora Source3: cloud-init-tmpfiles.conf @@ -31,12 +31,6 @@ Patch3: cloud-init-0.7.6-ecdsa.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1126365 Patch4: cloud-init-0.7.6-bzr1060-groupadd-list.patch -# Change network.target systemd deps to network-online.target -# https://bugzilla.redhat.com/show_bug.cgi?id=1110731 -# https://bugzilla.redhat.com/show_bug.cgi?id=1112817 -# https://bugzilla.redhat.com/show_bug.cgi?id=1147613 -Patch5: cloud-init-0.7.6-bzr1060-network-online.patch - # Use dnf instead of yum when available # https://bugzilla.redhat.com/show_bug.cgi?id=1194451 Patch7: cloud-init-0.7.6-dnf.patch @@ -63,6 +57,7 @@ BuildRequires: python3-jsonpatch BuildRequires: python3-mock BuildRequires: python3-nose BuildRequires: python3-oauthlib +BuildRequires: python3-prettytable BuildRequires: python3-pyserial BuildRequires: python3-PyYAML BuildRequires: python3-requests @@ -96,7 +91,7 @@ ssh keys and to let the user run various scripts. %prep -%autosetup -p1 -n %{name}-%{version}-bzr1060 +%autosetup -p1 -n %{name}-%{version}-bzr1137 # Change shebangs sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \ @@ -155,12 +150,14 @@ rm -rf $RPM_BUILD_ROOT %files %license LICENSE %doc ChangeLog README.fedora +%doc doc/* %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg %dir %{_sysconfdir}/cloud/cloud.cfg.d %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/*.cfg %doc %{_sysconfdir}/cloud/cloud.cfg.d/README %dir %{_sysconfdir}/cloud/templates %config(noreplace) %{_sysconfdir}/cloud/templates/* +/lib/udev/rules.d/66-azure-ephemeral.rules %{_unitdir}/cloud-config.service %{_unitdir}/cloud-config.target %{_unitdir}/cloud-final.service @@ -178,6 +175,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 13 2015 Garrett Holmstrom - 0.7.6-6.20150813bzr1137 +- Updated to bzr snapshot 1137 + * Wed Jun 17 2015 Fedora Release Engineering - 0.7.6-5.20140218bzr1060 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 418dccf..968d357 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -708db3a0f84cdb4420a0bb1b916a8fd0 cloud-init-0.7.6-bzr1060.tar.gz +b8537b7002f2904e0c1cf247b16a998f cloud-init-0.7.6-bzr1137.tar.gz