diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-11-17 15:22:29 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-17 15:22:29 -0400 |
| commit | b75db5ae653b7b87859e582528df9b03aa5366f1 (patch) | |
| tree | a7662a19f733ae044ef5ffe083d41b32ba4a488d /src/Propellor/Property/Chroot.hs | |
| parent | d796284d8bb483a89bf3d65d198a890a62090d96 (diff) | |
DiskImage creation automatically uses Chroot.noServices.
Diffstat (limited to 'src/Propellor/Property/Chroot.hs')
| -rw-r--r-- | src/Propellor/Property/Chroot.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs index a763a56b..30c11ed3 100644 --- a/src/Propellor/Property/Chroot.hs +++ b/src/Propellor/Property/Chroot.hs @@ -261,8 +261,10 @@ noServices = setup <!> teardown where f = "/usr/sbin/policy-rc.d" script = [ "#!/bin/sh", "exit 101" ] - setup = File.mode f (combineModes (readModes ++ executeModes)) - `requires` File.hasContent f script + setup = combineProperties "no services started" + [ File.hasContent f script + , File.mode f (combineModes (readModes ++ executeModes)) + ] teardown = File.notPresent f -- | Check if propellor is currently running within a chroot. |