summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Grub.hs
diff options
context:
space:
mode:
authorJoey Hess2017-03-02 19:04:43 -0400
committerJoey Hess2017-03-02 19:04:43 -0400
commitdfd95122ccb70d867995b133845eb4b63c054d1b (patch)
tree011318acc6ab8bbb5b94b1fd9b34365bdd61eb0a /src/Propellor/Property/Grub.hs
parent42d648723d79a116e5fbf840af095c517818cf58 (diff)
parente83fccd24947c0dad36b079b3acd4d645edac01b (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property/Grub.hs')
-rw-r--r--src/Propellor/Property/Grub.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/Grub.hs b/src/Propellor/Property/Grub.hs
index a03fc5a0..9dd5e8e1 100644
--- a/src/Propellor/Property/Grub.hs
+++ b/src/Propellor/Property/Grub.hs
@@ -69,7 +69,7 @@ chainPVGrub rootdev bootdev timeout = combineProperties desc $ props
& File.dirExists "/boot/grub"
& "/boot/grub/menu.lst" `File.hasContent`
[ "default 1"
- , "timeout " ++ show timeout
+ , "timeout " ++ val timeout
, ""
, "title grub-xen shim"
, "root (" ++ rootdev ++ ")"