cloud-init

Merge ~smoser/cloud-init:bug/systemd-sysinit-not-basic into cloud-init:master

  1. Git
  2. lp:~smoser/cloud-init
  3. bug/systemd-sysinit-not-basic
  4. Merge into master
Proposed by Scott Moser
Status: Merged
Merged at revision: d0e293e4d4a2d6b41c5e6e2ee312bb1aae6031a9
Proposed branch: ~smoser/cloud-init:bug/systemd-sysinit-not-basic
Merge into: cloud-init:master
Diff against target: 15 lines (+1/-1)
1 file modified
systemd/cloud-init-local.service (+1/-1)
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+310919@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

As you say, redundant (and DefaultDependencies=no already describes the intent anyway), but harmless. So fine for me if you prefer the explicit declaration.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service
2index 9b3e88f..7d89419 100644
3--- a/systemd/cloud-init-local.service
4+++ b/systemd/cloud-init-local.service
5@@ -3,10 +3,10 @@ Description=Initial cloud-init job (pre-networking)
6 DefaultDependencies=no
7 Wants=network-pre.target
8 After=systemd-remount-fs.service
9-Before=basic.target
10 Before=NetworkManager.service
11 Before=network-pre.target
12 Before=shutdown.target
13+Before=sysinit.target
14 Conflicts=shutdown.target
15 RequiresMountsFor=/var/lib
16

Subscribers

People subscribed via source and target branches