Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixops
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3647fd921511
Choose a base ref
...
head repository: NixOS/nixops
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c642e024d520
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 21, 2019

  1. ec2 backend: Remove support for AMI resizing <nixos 15.09

    @PsyanticY
    PsyanticY committed Mar 21, 2019
    Copy the full SHA
    26faad8 View commit details

Commits on Mar 22, 2019

  1. Merge pull request #1117 from PsyanticY/cleanup 

    ec2 backend: Remove support for AMI resizing <nixos 15.09
    @AmineChikhaoui
    AmineChikhaoui authored Mar 22, 2019
    Copy the full SHA
    c642e02 View commit details
Showing with 0 additions and 7 deletions.
  1. +0 −7 nixops/backends/ec2.py
7 changes: 0 additions & 7 deletions nixops/backends/ec2.py
View file
Original file line number Diff line number Diff line change
@@ -1120,13 +1120,6 @@ def create(self, defn, check, allow_reboot, allow_recreate):
self.public_host_key = new_key
nixops.known_hosts.update(None, self._ip_for_ssh_key(), self.public_host_key)

# Resize the root filesystem. On NixOS >= 15.09, this is done
# by the initrd.
if resize_root and nixops.util.parse_nixos_version(defn.config["nixosRelease"]) < ["15", "09"]:
self.log('resizing root disk...')
root_device_real = device_name_stored_to_real(root_device)
self.run_command("resize2fs {0}".format(root_device_real))

# Add disks that were in the original device mapping of image.
if self.first_boot:
for device_stored, dm in self._get_instance().block_device_mapping.items():