diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-06-12 11:00:10 +0900 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-06-12 11:00:10 +0900 |
| commit | 4a7448e9f22586419e3b9aefd8baa35fffa880b0 (patch) | |
| tree | d9b54cf7b4affe8375dc0c538dedc928357b4c87 | |
| parent | 5e224ff3c0bf2bb8e47f0b024f8105555047dcb2 (diff) | |
attempt to actually extract kernel version
| -rw-r--r-- | src/Propellor/Property/Reboot.hs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/Propellor/Property/Reboot.hs b/src/Propellor/Property/Reboot.hs index 41234489..d3b2d372 100644 --- a/src/Propellor/Property/Reboot.hs +++ b/src/Propellor/Property/Reboot.hs @@ -8,6 +8,7 @@ module Propellor.Property.Reboot ( import Propellor.Base import Data.List +import Data.String.Utils (split) import Data.Version type KernelVersion = String @@ -69,7 +70,8 @@ newerKernelAvailable wantV = do kernelImages <- installedKernelImages when (null kernelImages) $ error "failed to find any installed kernel images" - let installedV = maximum $ Prelude.read <$> kernelImages + let installedV = maximum $ + Prelude.read . extractKernelVersion <$> kernelImages return $ installedV >= wantV && runningV < wantV runningInstalledKernel :: IO Bool @@ -97,3 +99,9 @@ findVersion ver s = (" version " ++ ver ++ " ") `isInfixOf` s kernelsIn :: FilePath -> IO [FilePath] kernelsIn d = filter ("vmlinu" `isInfixOf`) <$> dirContents d + +-- TODO this is way too crude +extractKernelVersion :: String -> KernelVersion +extractKernelVersion s = + concat . reverse . drop 1 . reverse . drop 1 $ + split "-" s |