Merge branch 'master' of https://github.com/NixOS/nixos into pxe
pxe: rootfs has to be mounted read-write