diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-06-19 20:41:06 +0900 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-06-19 20:41:06 +0900 |
| commit | 3543f151201fcf10906716dca4ad470bda818295 (patch) | |
| tree | 06fa42271282b8ccc2aadb3b5f7a63fea394742e /src | |
| parent | 1a84be997bd9bacc632b0965f965557f7c10e686 (diff) | |
Reboot.toKernelNewerThan FailedChange not error
See discussion: <http://propellor.branchable.com/todo/merge_request:_changes_to_Reboot.hs/>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Reboot.hs | 9 |
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" |