[augeas-devel] augeas: master - Grub: allow optional argument for savedefault command

[David Lutterkort]

Gitweb:        http://git.fedorahosted.org/git/augeas.git?p=augeas.git;a=commitdiff;h=e290edeb935cdc5f963c0a3e524952621ad1d1db
Commit:        e290edeb935cdc5f963c0a3e524952621ad1d1db
Parent:        d4dd8228c7b8cafae6bd3f95314a51b787b602f2
Author:        David Lutterkort <lutter at redhat.com>
AuthorDate:    Thu Apr 9 16:05:18 2009 -0700
Committer:     David Lutterkort <lutter at redhat.com>
CommitterDate: Mon Apr 13 19:25:58 2009 -0700

Grub: allow optional argument for savedefault command

---
 lenses/grub.aug            |    5 ++++-
 lenses/tests/test_grub.aug |    3 +++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/lenses/grub.aug b/lenses/grub.aug
index 9eaa8e0..2aa1c12 100644
--- a/lenses/grub.aug
+++ b/lenses/grub.aug
@@ -88,6 +88,9 @@ module Grub =
       [ command "chainloader" "\t" .
           [ spc . switch "force" ]? . spc . store Rx.no_spaces . eol ]
 
+    let savedefault =
+      [ command "savedefault" "\t" . (spc . store Rx.integer)? . eol ]
+
     let boot_setting = kw_boot_arg "root"
                      | kernel
                      | kw_boot_arg "initrd"
@@ -95,7 +98,7 @@ module Grub =
                      | chainloader
                      | kw_boot_arg "uuid"
                      | kw_pres "quiet"  (* Seems to be a Ubuntu extension *)
-                     | kw_pres "savedefault"
+                     | savedefault
                      | module_line
 
     let boot = [ label "title" . title . boot_setting* ]
diff --git a/lenses/tests/test_grub.aug b/lenses/tests/test_grub.aug
index 45b5d6f..00d3e01 100644
--- a/lenses/tests/test_grub.aug
+++ b/lenses/tests/test_grub.aug
@@ -134,6 +134,9 @@ initrd\t\t/boot/initrd.img-2.6.18-6-vserver-686
   test Grub.boot_setting get
       "chainloader --force +1 \n" = { "chainloader" = "+1" { "force" } }
 
+  test Grub.savedefault put "savedefault\n" after
+    set "/savedefault" "3" = "savedefault 3\n"
+
 (* Local Variables: *)
 (* mode: caml       *)
 (* End:             *)