From 68438243d9d2a0b74bcf3b587c4d02db6bd28955 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Wed, 16 Mar 2016 14:29:39 -0700 Subject: [PATCH] units: remove user-configdrive.path This path unit is redundant since media-configdrive.mount will explicitly trigger this. systemd 229 changed the behavior of path units to implicitly add Requires for all RequiresMountsFor. This ends up unconditionally requiring user-configdrive.mount, which fails if there is no config drive. Since we really don't need to support this path outside of a mount, remove the explicit path unit. --- units/user-config.target | 2 -- units/user-configdrive.path | 10 ---------- 2 files changed, 12 deletions(-) delete mode 100644 units/user-configdrive.path diff --git a/units/user-config.target b/units/user-config.target index d7cb9091..8aba26c5 100644 --- a/units/user-config.target +++ b/units/user-config.target @@ -4,8 +4,6 @@ Requires=system-config.target After=system-config.target # Watch for configs at a couple common paths -Requires=user-configdrive.path -After=user-configdrive.path Requires=user-cloudinit@var-lib-coreos\x2dinstall-user_data.path After=user-cloudinit@var-lib-coreos\x2dinstall-user_data.path diff --git a/units/user-configdrive.path b/units/user-configdrive.path deleted file mode 100644 index fea642e9..00000000 --- a/units/user-configdrive.path +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Watch for a cloud-config at /media/configdrive - -# Note: This unit is essentially just here as a fall-back mechanism to -# trigger cloudinit if it isn't triggered explicitly by other means -# such as by a Wants= in the mount unit. This ensures we handle the -# case where /media/configdrive is provided to a CoreOS container. - -[Path] -DirectoryNotEmpty=/media/configdrive