Browse code

cloud-init: fix auto cloud-init startup

Change-Id: I88d8636134c27b3df24e9f0be17b942534095c0f
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6291
Tested-by: michellew <michellew@vmware.com>
Reviewed-by: Sharath George

akaher authored on 2018/12/04 22:47:46
Showing 2 changed files
... ...
@@ -2,7 +2,7 @@
2 2
 
3 3
 Name:           cloud-init
4 4
 Version:        18.3
5
-Release:        1%{?dist}
5
+Release:        2%{?dist}
6 6
 Summary:        Cloud instance init scripts
7 7
 Group:          System Environment/Base
8 8
 License:        GPLv3
... ...
@@ -22,6 +22,7 @@ Patch6:         systemd-service-changes.patch
22 22
 Patch7:         makecheck.patch
23 23
 Patch8:         systemd-resolved-config.patch
24 24
 Patch9:         cloud-init-azureds.patch
25
+Patch10:        ds-identity.patch
25 26
 
26 27
 BuildRequires:  python3
27 28
 BuildRequires:  python3-libs
... ...
@@ -77,6 +78,7 @@ ssh keys and to let the user run various scripts.
77 77
 %patch7 -p1
78 78
 %patch8 -p1
79 79
 %patch9 -p1
80
+%patch10 -p1
80 81
 
81 82
 find systemd -name "cloud*.service*" | xargs sed -i s/StandardOutput=journal+console/StandardOutput=journal/g
82 83
 
... ...
@@ -145,6 +147,8 @@ rm -rf $RPM_BUILD_ROOT
145 145
 
146 146
 
147 147
 %changelog
148
+*   Tue Dec 04 2018 Ajay Kaher <akaher@vmware.com> 18.3-2
149
+-   Fix auto startup at boot time
148 150
 *   Wed Oct 24 2018 Ajay Kaher <akaher@vmware.com> 18.3-1
149 151
 -   Upgraded version to 18.3
150 152
 *   Sun Oct 07 2018 Tapas Kundu <tkundu@vmware.com> 0.7.9-15
151 153
new file mode 100644
... ...
@@ -0,0 +1,12 @@
0
+diff -rupN cloud-init-18.3/tools/ds-identify cloud-init-18.3_ds-identity-fixed/tools/ds-identify
1
+--- cloud-init-18.3/tools/ds-identify	2018-06-20 00:19:26.000000000 +0000
2
+@@ -85,7 +85,7 @@ _DI_LOGGED=""
3
+ DI_MAIN=${DI_MAIN:-main}
4
+ 
5
+ DI_BLKID_OUTPUT=""
6
+-DI_DEFAULT_POLICY="search,found=all,maybe=all,notfound=${DI_DISABLED}"
7
++DI_DEFAULT_POLICY="search,found=all,maybe=all,notfound=${DI_ENABLED}"
8
+ DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=all,notfound=${DI_ENABLED}"
9
+ DI_DMI_CHASSIS_ASSET_TAG=""
10
+ DI_DMI_PRODUCT_NAME=""