steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Periodic merge of staging to master #14

Merged
steveej merged 71 commits from staging into master 2019-01-18 10:53:52 +00:00
Conversation 32 Commits 71 Files changed 44 +4
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1876fb8f1d - Show all commits

4
nix/os/devices/disk.nix
View file

@ -45,7 +45,11 @@ in rec {
[[ -e "''${NIXOS_CONFIG}" ]] [[ -e "''${NIXOS_CONFIG}" ]]
[[ -e "${mntRootVol}/nixos" ]] [[ -e "${mntRootVol}/nixos" ]]
sudo -E $SHELL <<EOF
# 'having $system set breaks nixos-install'
unset system
nixos-install --max-jobs 5 --cores 4 --no-root-passwd --root ${mntRootVol}/nixos nixos-install --max-jobs 5 --cores 4 --no-root-passwd --root ${mntRootVol}/nixos
EOF
''; '';
diskPrepare = pkgs.writeScript "script" '' diskPrepare = pkgs.writeScript "script" ''