From 937956ceb7235442d27c3587c9d2aeefeefe86fc Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Fri, 17 Jul 2015 00:37:17 -0400 Subject: [PATCH 1/2] ignition: add dependency on systemd-networkd.service --- .../sys-apps/ignition/files/ignition.target | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target index 544beb30ab..77cfbffb3b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target @@ -12,5 +12,10 @@ After=ignition-disks.service Requires=ignition-files.service After=ignition-files.service -Requires=systemd-networkd.service -After=systemd-networkd.service +# setup networking +Requires=initrd-systemd-networkd.service +After=initrd-systemd-networkd.service + +# generate resolv.conf +Requires=initrd-systemd-resolved.service +After=initrd-systemd-resolved.service From d8c77ef260aa4f06cdc3ea0c1e1193ddf70d9f68 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Mon, 20 Jul 2015 18:58:00 -0400 Subject: [PATCH 2/2] ignition: remove unnecessary Conflicts directives --- .../sys-apps/ignition/files/ignition-disks.service | 2 -- .../sys-apps/ignition/files/ignition-files.service | 1 - .../coreos-overlay/sys-apps/ignition/files/ignition.target | 1 - .../coreos-overlay/sys-apps/ignition/files/mnt-oem.mount | 1 - 4 files changed, 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service index f31a38db13..09566caceb 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-disks.service @@ -1,8 +1,6 @@ [Unit] Description=Ignition DefaultDependencies=false -Conflicts=initrd-switch-root.target -Before=initrd-switch-root.target Requires=local-fs-pre.target Before=local-fs-pre.target diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service index fec8fed282..2b9c867878 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition-files.service @@ -1,7 +1,6 @@ [Unit] Description=Ignition DefaultDependencies=false -Conflicts=initrd-switch-root.target Before=initrd-switch-root.target Requires=initrd-root-fs.target diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target index 77cfbffb3b..7043896ef2 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/ignition.target @@ -1,6 +1,5 @@ [Unit] DefaultDependencies=false -Conflicts=initrd-switch-root.target Before=initrd-switch-root.target OnFailure=emergency.target diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/mnt-oem.mount b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/mnt-oem.mount index 71139f2105..bfe9ed74b9 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/mnt-oem.mount +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/mnt-oem.mount @@ -1,6 +1,5 @@ [Unit] DefaultDependencies=false -Conflicts=initrd-switch-root.target Before=initrd-switch-root.target [Mount]