Branch: refs/heads/release-14.12
  Home:   https://github.com/NixOS/nixpkgs
  Commit: bc195e2feb51949e957802d2cf2878dfeac86dac
      
https://github.com/NixOS/nixpkgs/commit/bc195e2feb51949e957802d2cf2878dfeac86dac
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M nixos/modules/system/boot/stage-2-init.sh
    M nixos/modules/virtualisation/ec2-data.nix
    M nixos/modules/virtualisation/google-compute-image.nix
    M nixos/tests/installer.nix

  Log Message:
  -----------
  Paranoia

(cherry picked from commit efa8fc2b0a5e94fd22e26c31c82b643d2352e92a)

Conflicts:
        nixos/modules/virtualisation/google-compute-image.nix


  Commit: d693d4432fbd53a98ffefa1f955136cbf1902336
      
https://github.com/NixOS/nixpkgs/commit/d693d4432fbd53a98ffefa1f955136cbf1902336
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M nixos/modules/virtualisation/containers.nix

  Log Message:
  -----------
  NixOS containers: Create /root with 700 permission

Systemd-nspawn creates /root with 755 permission if it doesn't exist,
which is bad. So we have to create it ourselves before calling
systemd-nspawn.

(cherry picked from commit 3ca275d7ba92900fa793d4c9bf017e38394fcfec)


  Commit: 4599bfcc3b453ced5a47a50082ddd08b037dd91b
      
https://github.com/NixOS/nixpkgs/commit/4599bfcc3b453ced5a47a50082ddd08b037dd91b
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M nixos/modules/installer/tools/nixos-install.sh

  Log Message:
  -----------
  nixos-install: Create /root with 700 permission

(cherry picked from commit b9c4569b6b4c7fc3eb96b55cbf4043f2ba35a901)


  Commit: 916430748cb2c93ec3f974d5d5d6f395de8fbf85
      
https://github.com/NixOS/nixpkgs/commit/916430748cb2c93ec3f974d5d5d6f395de8fbf85
  Author: Eelco Dolstra <[email protected]>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M pkgs/build-support/vm/default.nix

  Log Message:
  -----------
  Fix a warning in initrd generation

${pkgs.busybox}/bin and ${pkgs.busybox}/sbin are now the same
directory, so don't copy both.

(cherry picked from commit 7358b8dfda345cbfb3d5427b0182850071351b4f)


Compare: https://github.com/NixOS/nixpkgs/compare/a71ce6abb50e...916430748cb2
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to