path: root/src/Propellor/Property/Systemd.hs
diff options
authorJoey Hess2019-04-08 13:32:32 -0400
committerJoey Hess2019-04-08 13:32:32 -0400
commitdd5cb6b03fe77ce7c4e46467048336c62d31b7a3 (patch)
tree642f6380634b37a5135881583dcaf14166e4991d /src/Propellor/Property/Systemd.hs
parent35435e16b63771c65f8223ff3fd2580cc8bad856 (diff)
change from inChroot to granular container capabilities info
* Removed inChroot, instead use hasContainerCapability FilesystemContained. (API change) * Hostname: Properties that used to not do anything in a systemd or docker container will now change the container's hostname, since it's namespaced. More container capabilities can easily be added later, to fine grain control what properties will run in different kinds of containers. This changed CmdLine's Read instance, which should be ok, because propellor inside the container is always updated at the same time as propellor outside, so when it chains into the chroot, it will know to expect the capability list. Docker was not setting InChroot before, but now sets both container capabilities, so chroot setting will also work in it. Note that, things that used to check inChroot before would not work in docker, but things that check FilesystemContained now will. It may be that some of those properties don't really work properly in docker. And, Grub.installed used to run grub-mkconfig in a docker container before, I doubt that made sense (was it even safe?); it doesn't do it now. This commit was sponsored by Trenton Cronholm on Patreon.
Diffstat (limited to 'src/Propellor/Property/Systemd.hs')
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs
index 9e9a1de1..bfc0f9a5 100644
--- a/src/Propellor/Property/Systemd.hs
+++ b/src/Propellor/Property/Systemd.hs
@@ -278,16 +278,21 @@ nspawned c@(Container name (Chroot.Chroot loc builder _ _) h) =
-- Chroot provisioning is run in systemd-only mode,
-- which sets up the chroot and ensures systemd and dbus are
-- installed, but does not handle the other properties.
- chrootprovisioned = Chroot.provisioned' chroot True
+ chrootprovisioned = Chroot.provisioned' chroot True [FilesystemContained]
-- Use nsenter to enter container and and run propellor to
-- finish provisioning.
containerprovisioned :: RevertableProperty Linux Linux
containerprovisioned =
- tightenTargets (Chroot.propellChroot chroot (enterContainerProcess c) False)
+ tightenTargets (Chroot.propellChroot chroot (enterContainerProcess c) False containercaps)
+ containercaps =
+ [ FilesystemContained
+ , HostnameContained
+ ]
chroot = Chroot.Chroot loc builder Chroot.propagateChrootInfo h
-- | Sets up the service files for the container, using the