diff options
| -rw-r--r-- | joeyconfig.hs | 5 | ||||
| -rw-r--r-- | src/Propellor/Property/Grub.hs | 16 |
2 files changed, 11 insertions, 10 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs index 258df4b1..3d895e69 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -89,8 +89,9 @@ darkstar = host "darkstar.kitenet.net" $ props & ipv6 "2001:4830:1600:187::2" & Hostname.sane & Apt.serviceInstalledRunning "swapspace" - & Grub.cmdline_Linux "i915.enable_psr=1" - ! Grub.cmdline_Linux "quiet" + ! Grub.cmdline_Linux_default "quiet" + -- Power consumption tuning + & Grub.cmdline_Linux_default "i915.enable_psr=1" & JoeySites.dkimMilter & JoeySites.postfixSaslPasswordClient diff --git a/src/Propellor/Property/Grub.hs b/src/Propellor/Property/Grub.hs index 573a30f3..79ecd8c9 100644 --- a/src/Propellor/Property/Grub.hs +++ b/src/Propellor/Property/Grub.hs @@ -6,7 +6,7 @@ module Propellor.Property.Grub ( mkConfig, installed', configured, - cmdline_Linux, + cmdline_Linux_default, boots, bootsMounted, TimeoutSecs, @@ -83,15 +83,15 @@ configured k v = ConfFile.adjustSection simpleConfigFile :: FilePath simpleConfigFile = "/etc/default/grub" --- | Adds a word to the linux command line. Any other words in the command --- line will be left unchanged. +-- | Adds a word to the default linux command line. +-- Any other words in the command line will be left unchanged. -- -- Example: -- --- > & Grub.cmdline_Linux "i915.enable_psr=1" --- > ! Grub.cmdline_Linux "quiet" -cmdline_Linux :: String -> RevertableProperty DebianLike DebianLike -cmdline_Linux w = setup <!> undo +-- > & Grub.cmdline_Linux_default "i915.enable_psr=1" +-- > ! Grub.cmdline_Linux_default "quiet" +cmdline_Linux_default :: String -> RevertableProperty DebianLike DebianLike +cmdline_Linux_default w = setup <!> undo where setup = ConfFile.adjustSection ("linux command line includes " ++ w) @@ -109,7 +109,7 @@ cmdline_Linux w = setup <!> undo (++ [mkline [""]]) simpleConfigFile `onChange` mkConfig - k = "GRUB_CMDLINE_LINUX" + k = "GRUB_CMDLINE_LINUX_DEFAULT" isline s = (k ++ "=") `isPrefixOf` s mkline ws = k ++ "=" ++ shellEscape (unwords ws) getws = concatMap words . shellUnEscape . drop 1 . dropWhile (/= '=') |