Unverified Commit 72f73120 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #316162 from adamcstephens/lxd/vm-cfg-rw 

lxd-virtual-machine-image: install initial configuration read-write
parents 5a7646f5 dfd0d14e

nixos/maintainers/scripts/lxd/lxd-container-image.nix

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    };

  in ''

    if [ ! -e /etc/nixos/configuration.nix ]; then

      install -m 644 -D ${config} /etc/nixos/configuration.nix

      install -m 0644 -D ${config} /etc/nixos/configuration.nix

    fi

  '';

nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
    };

  in ''

    if [ ! -e /etc/nixos/configuration.nix ]; then

      mkdir -p /etc/nixos

      cp ${config} /etc/nixos/configuration.nix

      install -m 0644 -D ${config} /etc/nixos/configuration.nix

    fi

  '';