diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-02 19:10:00 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-02 19:59:28 +0100 |
| commit | e618492168657c8617e5b3bec05d6bc14233ef14 (patch) | |
| tree | f467f1aa4074d8161995697299a4f2a395ce8eaa /nixos/modules/virtualisation/amazon-image.nix | |
| parent | cc925d0506ab2a049d5ee55c1173950073ed307f (diff) | |
| download | nixpkgs-e618492168657c8617e5b3bec05d6bc14233ef14.tar nixpkgs-e618492168657c8617e5b3bec05d6bc14233ef14.tar.gz nixpkgs-e618492168657c8617e5b3bec05d6bc14233ef14.tar.bz2 nixpkgs-e618492168657c8617e5b3bec05d6bc14233ef14.tar.lz nixpkgs-e618492168657c8617e5b3bec05d6bc14233ef14.tar.xz nixpkgs-e618492168657c8617e5b3bec05d6bc14233ef14.tar.zst nixpkgs-e618492168657c8617e5b3bec05d6bc14233ef14.zip | |
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.
Diffstat (limited to 'nixos/modules/virtualisation/amazon-image.nix')
| -rw-r--r-- | nixos/modules/virtualisation/amazon-image.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 7d16206517d..2f6a95786a2 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" |