summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2018-02-01 11:57:06 -0400
committerJoey Hess2018-02-01 11:57:06 -0400
commit121c20726cebf3657b0b5d22d220cbdc7aa1aac4 (patch)
treedc3422e5d45a0763bc32da31f5da2b27ea82ed7a /src
parentece2f100ff7cb77ec6181b2cee95d4215fb38926 (diff)
add only to default linux command line
Don't affect rescue mode.
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/Grub.hs16
1 files changed, 8 insertions, 8 deletions
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 (/= '=')