obadz
c7142c1aa3
Merge branch 'master' into staging
2016-08-28 13:33:13 +01:00
Domen Kožar
4af09e0031
Merge pull request #14311 from Profpatsch/mkRemovedOptionModule-replacement
...
mkRemovedOptionModule: add replacement argument
2016-08-28 13:55:28 +02:00
Robin Gloster
8031cba2ab
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-06-10 09:27:04 +00:00
Eelco Dolstra
f222689aba
Use systemd-boot instead of gummiboot
...
Gummiboot is part of systemd now so we may as well use it.
2016-05-31 17:02:47 +02:00
Robin Gloster
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00:00
Profpatsch
16c923cef2
modules/mkRemovedOptionModule: add replacement doc
...
When displaying a warning about a removed Option we should always
include reasoning why it was removed and how to get the same
functionality without it.
Introduces such a description argument and patches occurences (mostly
with an empty string).
startGnuPGAgent: further notes on replacement
2016-05-29 00:42:08 +02:00
Eelco Dolstra
32bed83b18
Remove boot.loader.grub.timeout and boot.loader.gummiboot.timeout
...
There is a generic boot.loader.timeout option.
2016-05-25 11:39:17 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
Robin Gloster
c92bca56f8
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-02 22:58:02 +00:00
Nikolay Amiantov
ab0a0c004e
makeSearchPathOutputs: refactor to makeSearchPathOutput
2016-04-25 13:24:39 +03:00
Alexander Ried
1d6990db06
boot.loader.grub: fix variable name ( #14855 )
2016-04-20 22:27:34 +02:00
Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
Nikolay Amiantov
8b7ebaffeb
replace makeSearchPath tree-wise to take care of possible multiple outputs
2016-04-13 22:09:41 +03:00
Robin Gloster
a73a28de7b
fix grammar errors
2016-04-06 16:16:23 +00:00
Thomas Strobel
a04a7272aa
Add missing 'type', 'defaultText' and 'literalExample' in module definitions
...
- add missing types in module definitions
- add missing 'defaultText' in module definitions
- wrap example with 'literalExample' where necessary in module definitions
2016-01-17 19:41:23 +01:00
Tobias Geerinckx-Rice
82419575aa
btrfsProgs -> canonical btrfs-progs
2016-01-03 20:38:44 +01:00
Thomas Strobel
d856841ba4
nixos trustedGRUB: add support for HP laptops
2015-12-22 03:12:30 +01:00
Nicole Angel
c840974c24
grub: fix typo in variable name (trivial)
2015-12-10 19:52:08 +01:00
Eelco Dolstra
5f077e2296
Factor out option renaming
...
Option aliases/deprecations can now be declared in any NixOS module,
not just in nixos/modules/rename.nix. This is more modular (since it
allows for example grub-related aliases to be declared in the grub
module), and allows aliases outside of NixOS (e.g. in NixOps modules).
The syntax is a bit funky. Ideally we'd have something like:
options = {
foo.bar.newOption = mkOption { ... };
foo.bar.oldOption = mkAliasOption [ "foo" "bar" "newOption" ];
};
but that's not possible because options cannot define values in
*other* options - you need to have a "config" for that. So instead we
have functions that return a *module*: mkRemovedOptionModule,
mkRenamedOptionModule and mkAliasOptionModule. These can be used via
"imports", e.g.
imports = [
(mkAliasOptionModule [ "foo" "bar" "oldOption" ] [ "foo" "bar" "newOption" ]);
];
As an added bonus, deprecation warnings now show the file name of the
offending module.
Fixes #10385 .
2015-10-14 18:18:47 +02:00
Thomas Strobel
7a8980193d
nixos grub: trustedBoot: introduce safety check that TPM is available
2015-10-06 20:12:39 +02:00
Eelco Dolstra
c49b24c940
Fix capitalisation
2015-07-25 19:06:07 +02:00
Thomas Strobel
65cbbc75b0
grub installation: integrate trustedGRUB + fix broken equality check
2015-07-05 19:51:53 +02:00
Luca Bruno
033605e87f
Merge branch 'nixos-subdir'
...
Conflicts:
nixos/modules/system/boot/loader/grub/grub.nix
2015-06-13 15:18:12 +02:00
Luca Bruno
3754de550f
nixos/grub: allow customization of the nix store path
2015-06-13 15:02:00 +02:00
William A. Kennington III
502a19b2b4
nixos/grub: Support labeling efi bootloaders with independent id's
2015-06-10 15:47:08 -07:00
William A. Kennington III
c891134b77
nixos/grub: Prevent module errors and make gfxmode configurable
2015-06-10 11:50:35 -07:00
William A. Kennington III
48381b7621
nixos-artwork: Make into a derivation and use fetchfromgithub
2015-06-08 18:32:32 -07:00
William A. Kennington III
1e98da6d99
nixos/grub: Use nixos artwork
2015-05-29 13:26:32 -07:00
William A. Kennington III
d4f3930201
nixos/grub: Fix defaultConfig
2015-05-29 13:26:32 -07:00
William A. Kennington III
b07d2a447b
nixos/grub: Fix assertion
2015-05-25 23:03:31 -07:00
William A. Kennington III
fd5b273e82
nixos/grub: Add the ability to mirror grub to multiple partitions
2015-05-25 20:23:06 -07:00
Alexei Robyn
60da99ea2a
grub module: removed invalid device check for grub EFI installation
2015-04-30 19:28:34 +10:00
Joachim Fasting
d375550ead
nixos: add a few missing type specifiers under boot.*
2015-02-28 09:19:23 +01:00
Thomas Strobel
c61ff9b51e
Fix grubTarget on nodev installs
2015-02-16 20:19:44 +01:00
William A. Kennington III
1fddcd1e83
grub: Don't remove zfs support if contained in the default binary
2015-02-13 14:40:41 -08:00
Shea Levy
24c0844cfb
Fix grub on nodev installs
2015-02-08 22:31:14 -05:00
William A. Kennington III
2a0754ccbc
Merge pull request #5994 from ts468/grub
...
Add 'target' parameter for GRUB installation chain
2015-02-08 14:18:13 -08:00
Bob van der Linden
f93ba51469
nixos: loader: added generic config.boot.loader.timeout option
...
timeout options of grub and gummiboot will inherit the value of this
option by default.
2015-01-30 09:53:44 +01:00
Thomas Strobel
3767370866
Add target parameter to grub installation chain
2015-01-27 19:46:37 +01:00
Franz Pletz
30690d05bc
Add cryptodisk support for Grub
...
Closes #4193
2014-09-24 21:48:55 +01:00
Luca Bruno
dfa6f03ea3
Do not assert absolute path for nodev grub device. Closes #3996
2014-09-08 12:00:34 +02:00
William A. Kennington III
c6bd6d6d89
nixos/grub: Assert devices should be absolute paths
2014-09-04 10:31:39 -07:00
William A. Kennington III
f73f7ccc6e
nixos/install-grub: Read correct mountpoints
2014-09-04 10:31:39 -07:00
William A. Kennington III
36614ff3e2
Revert "Revert "Merge pull request #2449 from wkennington/master.grub""
...
This reverts commit 94205f5f21
2014-09-02 09:16:13 -07:00
Michael Raskin
94205f5f21
Revert "Merge pull request #2449 from wkennington/master.grub"
...
This reverts commit 469f22d7170078bc5d8f
2014-08-31 12:58:37 +04:00
William A. Kennington III
d4a9645ef0
nixos/grub: Needs mount so add utillinux to bin
2014-08-28 13:35:35 -07:00
William A. Kennington III
8329d12b79
grub: Change fsIdentifier to str from string
2014-08-28 13:35:35 -07:00
William A. Kennington III
525acb4d4f
nixos/grub: Fix typo
2014-08-28 13:35:35 -07:00
William A. Kennington III
a6e6c85f06
grub: Add support for detecting btrfs subvolumes
2014-08-28 13:35:35 -07:00
William A. Kennington III
fba9f641a8
grub: Add support for forcing devices to be identified with labels or UUIDs
2014-08-28 13:35:35 -07:00
