From 4ab4468d4dfb71165a0465d36b93e5b9ee762acf Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 29 Jul 2016 16:11:26 -0700 Subject: [PATCH] sys-apps/ignition: use upstream systemd network unit names --- .../sys-apps/ignition/files/ignition-disks.service | 8 ++++---- .../sys-apps/ignition/files/ignition-files.service | 8 ++++---- .../{ignition-0.8.0.ebuild => ignition-0.8.0-r1.ebuild} | 0 3 files changed, 8 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/{ignition-0.8.0.ebuild => ignition-0.8.0-r1.ebuild} (100%) 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 f3ca65b7b7..8180072d72 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 @@ -6,12 +6,12 @@ Requires=local-fs-pre.target Before=local-fs-pre.target # setup networking -Wants=initrd-systemd-networkd.service -After=initrd-systemd-networkd.service +Wants=systemd-networkd.service +After=systemd-networkd.service # generate resolv.conf -Wants=initrd-systemd-resolved.service -After=initrd-systemd-resolved.service +Wants=systemd-resolved.service +After=systemd-resolved.service # prevent racing with sgdisk and its subsequent udev activity After=disk-uuid.service 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 b68db08b9c..1405bf9aec 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 @@ -14,12 +14,12 @@ Requires=initrd-setup-root.service After=initrd-setup-root.service # setup networking -Wants=initrd-systemd-networkd.service -After=initrd-systemd-networkd.service +Wants=systemd-networkd.service +After=systemd-networkd.service # generate resolv.conf -Wants=initrd-systemd-resolved.service -After=initrd-systemd-resolved.service +Wants=systemd-resolved.service +After=systemd-resolved.service [Service] Type=oneshot diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.8.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.8.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.8.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.8.0-r1.ebuild