From 3af715af900298476bea9f487429b1941130d0ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 17 Dec 2016 11:40:34 +0100 Subject: [PATCH] Revert "fix 2 xml errors in the description of boot.loader.grub.efiInstallAsRemovable" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 656cc3acafcb30e3503f4d3e39694ca996c66015 because it causes building the manual to fail: $ nixos-rebuild build ... building path(s) ‘/nix/store/s9y5z78z5pssvmixcmv9ix13gs8xj87f-manual-olinkdb’ Writing /nix/store/s9y5z78z5pssvmixcmv9ix13gs8xj87f-manual-olinkdb/manual.db for book(book-nixos-manual) ./man-pages.xml:625: element para: Relax-NG validity error : Did not expect element para there ./man-pages.xml:3: element variablelist: Relax-NG validity error : Element refsection has extra content: variablelist ./man-pages.xml:29: element refsection: Relax-NG validity error : Element refentry has extra content: refsection ./man-pages.xml:3: element reference: Relax-NG validity error : Element reference failed to validate content ./man-pages.xml fails to validate CC @cleverca22, @Mic92 --- nixos/modules/system/boot/loader/grub/grub.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index b5bb26fb8d20..294fc1988e9f 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -361,7 +361,7 @@ in example = true; type = types.bool; description = '' - Whether to invoke grub-install with + Whether to invoke grub-install with --removable. Unless you turn this on, GRUB will install itself somewhere in @@ -391,7 +391,6 @@ in You simply dislike the idea of depending on NVRAM state to make your drive bootable - ''; };