From e618492168657c8617e5b3bec05d6bc14233ef14 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Feb 2016 19:10:00 +0100 Subject: [PATCH] Revert "Do not relocate /nix and /tmp to small disks on AWS" This reverts commit f10bead8fd068f2cb82cbdc1a938a67bd967974c because it doesn't work - there is no lsblk in the initrd, and there is a missing backslash. --- nixos/modules/virtualisation/amazon-image.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 7d16206517d4..2f6a95786a2c 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -79,11 +79,7 @@ let cfg = config.ec2; in diskNr=$((diskNr + 1)) echo "mounting $device on $mp..." if mountFS "$device" "$mp" "" ext3; then - if [ -z "$diskForUnionfs" -a \ - $(lsblk -bno size $device) -gt $(lsblk -bno size /dev/xvda1) - ]; then - diskForUnionfs="$mp"; - fi + if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi fi else echo "skipping unknown device type $device"