Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixops
  Commit: 35f06637ff9c6208a47432d8e9715b8b8dbe1541
      
https://github.com/NixOS/nixops/commit/35f06637ff9c6208a47432d8e9715b8b8dbe1541
  Author: aszlig <[email protected]>
  Date:   2015-10-31 (Sat, 31 Oct 2015)

  Changed paths:
    M nix/eval-machine-info.nix
    M nixops/backends/ec2.py
    M nixops/backends/gce.py
    M nixops/deployment.py

  Log Message:
  -----------
  eval-machine-info: Switch to system.nixosRelease.

"system.nixosVersion" contains a version suffix, so for our purposes
it can lead to bugs if we want to compare it against the stateVersion.

In order to avoid confusion, the attribute exported by eval-machine-
info is now called nixosRelease rather than nixosVersion, because it
corresponds to system.nixosRelease introduced in NixOS/nixpkgs@d166c85.

If there is no system.nixosRelease is available, we're falling back to
using nixosVersion and stripping off the nixosVersionSuffix so if we use
an older release we still have the same value, because
system.nixosVersion is just nixosRelease + nixosVersionSuffix.

Tested against release-15.09 and release-14.12 using the VM tests.

Signed-off-by: aszlig <[email protected]>


  Commit: f451980969902a601cea59c89c61b568477b84fa
      
https://github.com/NixOS/nixops/commit/f451980969902a601cea59c89c61b568477b84fa
  Author: aszlig <[email protected]>
  Date:   2015-10-31 (Sat, 31 Oct 2015)

  Changed paths:
    M nixops/backends/hetzner.py

  Log Message:
  -----------
  backends/hetzner: Create /mnt/run if not existing.

We need to create this in _bootstrap_rescue_for_existing_system() to
make sure the bootstrap even works for NixOS 14.12, because when
bootstrapping, /run isn't yet available.

Signed-off-by: aszlig <[email protected]>


  Commit: 9076dbc722a4125b2a08d4b49d94b2073b71578f
      
https://github.com/NixOS/nixops/commit/9076dbc722a4125b2a08d4b49d94b2073b71578f
  Author: aszlig <[email protected]>
  Date:   2015-10-31 (Sat, 31 Oct 2015)

  Changed paths:
    M nixops/backends/hetzner.py
    M nixops/deployment.py

  Log Message:
  -----------
  backends/hetzner: Set state_version on install.

This reverts commit f2bf13726a2434626925fd105e60d4745eafe104.

Because we now have config['nixosRelease'], we can properly set the
state version before we even switch to the configuration even in rescue.

So we no longer need the workaround of omitting the state version check
while in rescue, because at that time the machine should already have a
state_version.

Signed-off-by: aszlig <[email protected]>


Compare: https://github.com/NixOS/nixops/compare/018bca51aad9...9076dbc722a4
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to