rpms/cloud-init
8
1
Fork 1
Code Issues Pull Requests Releases Activity

Change network.target systemd deps to network-online.target

Browse Source 
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
This commit is contained in:
Garrett Holmstrom 2015-02-19 16:39:57 -08:00
parent a510c9bf09
commit 851688f459
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
cloud-init-0.7.6-network-online.patch Normal file
View File

@ -0,0 +1,45 @@
Index: cloud-init-0.7.6/systemd/cloud-config.service
===================================================================
--- cloud-init-0.7.6.orig/systemd/cloud-config.service
+++ cloud-init-0.7.6/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/systemd/cloud-init.service
===================================================================
--- cloud-init-0.7.6.orig/systemd/cloud-init.service
+++ cloud-init-0.7.6/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
-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/systemd/cloud-final.service
===================================================================
--- cloud-init-0.7.6.orig/systemd/cloud-final.service
+++ cloud-init-0.7.6/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

7
cloud-init.spec
View File

@ -37,6 +37,12 @@ Patch3: cloud-init-0.7.6-ecdsa.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1126365
Patch4: cloud-init-0.7.6-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-network-online.patch
# Deal with noarch -> arch
# https://bugzilla.redhat.com/show_bug.cgi?id=1067089
Obsoletes: cloud-init < 0.7.5-3
@ -168,6 +174,7 @@ fi
- Stopped implicitly listing doc files twice
- Added recognition of 3 ecdsa-sha2-nistp* ssh key types [RH:1151824]
- Fixed handling of user group lists that contain spaces [RH:1126365 LP:1354694]
- Changed network.target systemd deps to network-online.target [RH:1110731 RH:1112817 RH:1147613]
* Fri Nov 14 2014 Colin Walters <walters@redhat.com> - 0.7.6-2
- New upstream version [RH:974327]