diff options
author | William A. Kennington III <william@wkennington.com> | 2015-05-29 13:26:51 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-05-29 13:26:51 -0700 |
commit | aa5d6922c559d15ec8a17eccb23c0f5a27160946 (patch) | |
tree | a0cfb2229317a79ed9f44cdb0d4371c42d369cb3 /nixos/modules/virtualisation | |
parent | 1e98da6d992522ae26bc37bb670b09805f44b762 (diff) |
Revert "Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config."
The issue was that grub was not building the default entry which would leave systems unbootable. This can now be safely reverted as the default entry is being built once again. This reverts commit fd1fb0403c406d1c3aca07735bb247e0643bdb0d.
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/amazon-image.nix | 2 | ||||
-rw-r--r-- | nixos/modules/virtualisation/azure-common.nix | 2 | ||||
-rw-r--r-- | nixos/modules/virtualisation/google-compute-image.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index dc92e4f609fb3..600a29f31bc56 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -170,7 +170,7 @@ in # Don't put old configurations in the GRUB menu. The user has no # way to select them anyway. - boot.loader.grub.configurationLimit = 1; + boot.loader.grub.configurationLimit = 0; # Allow root logins only using the SSH key that the user specified # at instance creation time. diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index a6368eb2c625a..47022c6887c3e 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -14,7 +14,7 @@ with lib; # Don't put old configurations in the GRUB menu. The user has no # way to select them anyway. - boot.loader.grub.configurationLimit = 1; + boot.loader.grub.configurationLimit = 0; fileSystems."/".device = "/dev/disk/by-label/nixos"; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index eea6c646d4838..ee5485071a35c 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -106,7 +106,7 @@ in # Don't put old configurations in the GRUB menu. The user has no # way to select them anyway. - boot.loader.grub.configurationLimit = 1; + boot.loader.grub.configurationLimit = 0; # Allow root logins only using the SSH key that the user specified # at instance creation time. |