From aa5d6922c559d15ec8a17eccb23c0f5a27160946 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 May 2015 13:26:51 -0700 Subject: [PATCH] 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. --- nixos/modules/virtualisation/amazon-image.nix | 2 +- nixos/modules/virtualisation/azure-common.nix | 2 +- 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 dc92e4f609fb..600a29f31bc5 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 a6368eb2c625..47022c6887c3 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 eea6c646d483..ee5485071a35 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.