From c3674e3d1dbb4035e6dcd9e7e19076109b73eb76 Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Mon, 24 Aug 2015 18:26:00 -0700 Subject: [PATCH] sys-apps/ignition: ignition-files requires initrd-setup-root.service ignition-files can do things like add users and ssh keys, we use shadowutils to do this which requires a minimally setup root filesystem. Since ignition-disks might completely wipe the root filesystem, initrd-setup-root must run to get us boot-strapped. --- .../sys-apps/ignition/files/ignition-files.service | 7 +++++++ .../{ignition-0.1.3.ebuild => ignition-0.1.3-r1.ebuild} | 0 2 files changed, 7 insertions(+) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/{ignition-0.1.3.ebuild => ignition-0.1.3-r1.ebuild} (100%) 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 c147e545a8..e806d1a890 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 @@ -9,6 +9,13 @@ After=initrd-root-fs.target Requires=mnt-oem.mount After=mnt-oem.mount +Requires=ignition-disks.service +After=ignition-disks.service + +# setup the root filesystem before we try do things like create users on it. +Requires=initrd-setup-root.service +After=initrd-setup-root.service + # setup networking Wants=initrd-systemd-networkd.service After=initrd-systemd-networkd.service diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.3-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.1.3-r1.ebuild