From 3560d5f4c6c37f02a95c4e5da300b05b82d74efb Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 15 Jul 2021 10:15:39 -0400
Subject: [PATCH] undo the pointless shuffle
---
morph/lib/issuer-aws.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/morph/lib/issuer-aws.nix b/morph/lib/issuer-aws.nix
index 16db454e..a66ab72a 100644
--- a/morph/lib/issuer-aws.nix
+++ b/morph/lib/issuer-aws.nix
@@ -1,5 +1,10 @@
{ name, lib, ... }: {
imports = [ <nixpkgs/nixos/modules/virtualisation/amazon-image.nix> ];
+
+ # amazon-image.nix isn't quite aware of nvme-attached storage so give it a
+ # little help configuring grub.
+ boot.loader.grub.device = lib.mkForce "/dev/nvme0n1";
+
ec2.hvm = true;
boot.kernel.sysctl = { "vm.swappiness" = 0; };
swapDevices = [ {
@@ -12,9 +17,4 @@
# morph-supplied name. See also
# <https://github.com/DBCDK/morph/issues/146>.
networking.hostName = name;
-
- # amazon-image.nix isn't quite aware of nvme-attached storage so give it a
- # little help configuring grub.
- boot.loader.grub.device = lib.mkForce "/dev/nvme0n1";
-
}
--
GitLab