summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2017-04-17 11:01:39 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2017-04-17 17:41:54 +0200
commita9eadc06ac57846aaa8fdeb550b32e44f59c9437 (patch)
tree343a9c0fdb7ff02e49c871bef967a75f19139909
parente5f0563d5d2cee21cd05b681e940af920f7ef979 (diff)
downloadpatches-a9eadc06ac57846aaa8fdeb550b32e44f59c9437.tar
patches-a9eadc06ac57846aaa8fdeb550b32e44f59c9437.tar.gz
scripts: system: Rename --no-grub option to --no-bootloader.
* guix/scripts/system.scm (%options, show-help): Adjust accordingly. Keep "--no-grub" for compatibility reasons, but do not mention it in the help. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
-rw-r--r--guix/scripts/system.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 9ffdc15abb..8fabdb5c14 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -765,7 +765,7 @@ Some ACTIONS support additional ARGS.\n"))
(display (_ "
--image-size=SIZE for 'vm-image', produce an image of SIZE"))
(display (_ "
- --no-grub for 'init', do not install GRUB"))
+ --no-bootloader for 'init', do not install a bootloader"))
(display (_ "
--share=SPEC for 'vm', share host file system according to SPEC"))
(display (_ "
@@ -804,7 +804,7 @@ Some ACTIONS support additional ARGS.\n"))
(lambda (opt name arg result)
(alist-cons 'image-size (size->number arg)
result)))
- (option '("no-grub") #f #f
+ (option '("no-bootloader" "no-grub") #f #f
(lambda (opt name arg result)
(alist-cons 'install-bootloader? #f result)))
(option '("full-boot") #f #f