Ubuntu Pastebin

Paste from smoser at Tue, 15 Nov 2016 22:32:14 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
diff --git a/debian/changelog b/debian/changelog
index 60d16ba..c556c49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,19 @@
-cloud-init (0.7.8-45-g584b843-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
+cloud-init (0.7.8-47-gb6561a1-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
   * debian/cloud-init.templates: enable DigitalOcean by default [Ben Howard]
   * New upstream snapshot.
     - systemd/cloud-init-local.service:
       + replace 'Wants' and 'After' on local-fs.target with more granular
         After=systemd-remount-fs.service and RequiresMountsFor=/var/lib
+        and Before=sysinit.target.
         This is done run sufficiently early enough to update /etc/fstab.
         (LP: #1611074)
-      + add Before=basic.target.
       + add Before=NetworkManager.service so that cloud-init can render
         NetworkManager network config before it would apply them.
     - systemd/cloud-init.service:
       + add Before=sysinit.target and DefaultDependencies=no (LP: #1611074)
-      + add After=systemd-networkd-wait-online.service and
-        drop Requires=networking.service to work with systemd-networkd
-        systems where networking.service is not needed.
-        (LP: #1636912, #1629797)
+      + drop Requires=networking.service to work where networking.service is
+        not needed.
       + add Conflicts=shutdown.target
       + drop unnecessary Wants=local-fs.target
     - net: support reading ipv6 dhcp config from initramfs [LaMont Jones]
@@ -63,7 +61,7 @@ cloud-init (0.7.8-45-g584b843-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
       + tests: silence the Cheetah UserWarning about NameMapper C version.
       + Fix python2.6 things found running in centos 6.
 
- -- Scott Moser <smoser@ubuntu.com>  Tue, 15 Nov 2016 15:27:42 -0500
+ -- Scott Moser <smoser@ubuntu.com>  Tue, 15 Nov 2016 17:29:12 -0500
 
 cloud-init (0.7.8-1-g3705bb5-0ubuntu1~16.04.3) xenial-proposed; urgency=medium
 
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service
index 9b3e88f..7d89419 100644
--- a/systemd/cloud-init-local.service
+++ b/systemd/cloud-init-local.service
@@ -3,10 +3,10 @@ Description=Initial cloud-init job (pre-networking)
 DefaultDependencies=no
 Wants=network-pre.target
 After=systemd-remount-fs.service
-Before=basic.target
 Before=NetworkManager.service
 Before=network-pre.target
 Before=shutdown.target
+Before=sysinit.target
 Conflicts=shutdown.target
 RequiresMountsFor=/var/lib
 
diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service
index cde6ed8..fb3b918 100644
--- a/systemd/cloud-init.service
+++ b/systemd/cloud-init.service
@@ -6,7 +6,6 @@ Wants=sshd-keygen.service
 Wants=sshd.service
 After=cloud-init-local.service
 After=networking.service
-After=systemd-networkd-wait-online.service
 Before=network-online.target
 Before=sshd-keygen.service
 Before=sshd.service
Download as text