summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Reboot.hs
diff options
context:
space:
mode:
authorJoey Hess2016-06-21 11:08:24 -0400
committerJoey Hess2016-06-21 11:08:24 -0400
commit4db15a017a5defb2721803eae258a425ca74f8e9 (patch)
treeb402311e32dec9156b4990d0beeaf3cf2072e8ef /src/Propellor/Property/Reboot.hs
parent11f046f41a3f717b52e1f3a9d404427dd06a403e (diff)
parent632c2bb3639d043d7d9101b6fd2f198e6ac8cd8f (diff)
Merge remote-tracking branch 'spwhitton/reboot'
Diffstat (limited to 'src/Propellor/Property/Reboot.hs')
-rw-r--r--src/Propellor/Property/Reboot.hs9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/Propellor/Property/Reboot.hs b/src/Propellor/Property/Reboot.hs
index 6a0626a2..31731dc2 100644
--- a/src/Propellor/Property/Reboot.hs
+++ b/src/Propellor/Property/Reboot.hs
@@ -64,7 +64,7 @@ toDistroKernel = check (not <$> runningInstalledKernel) now
-- | Given a kernel version string @v@, reboots immediately if the running
-- kernel version is strictly less than @v@ and there is an installed kernel
--- version is greater than or equal to @v@. Dies if the requested kernel
+-- version is greater than or equal to @v@. Fails if the requested kernel
-- version is not installed.
--
-- For this to be useful, you need to have ensured that the installed kernel
@@ -83,12 +83,7 @@ toKernelNewerThan ver =
if runningV >= wantV then noChange
else if installedV >= wantV
then ensureProperty w now
- -- Stop propellor here because other
- -- properties may be incorrectly ensured
- -- under a kernel version that's too old.
- -- E.g. Sbuild.built can fail
- -- to add the config line `union-type=overlay`
- else stopPropellorMessage $
+ else errorMessage $
"kernel newer than "
++ ver
++ " not installed"