Periodic merge of staging to master #14

Merged
steveej merged 71 commits from staging into master 2019-01-18 10:53:52 +00:00
Showing only changes of commit de6a675cfb - Show all commits

View file

@ -29,10 +29,10 @@ in rec {
diskUmount = pkgs.writeScript "script" ''
#!/usr/bin/env bash
set -xe
umount -R ${mntRootVol}
rmdir ${mntRootVol}
vgchange -an ${ownLib.disk.volumeGroup diskId}
cryptsetup luksClose ${ownLib.disk.luksName diskId}
sudo umount -R ${mntRootVol}
sudo rmdir ${mntRootVol}
sudo vgchange -an ${ownLib.disk.volumeGroup diskId}
sudo cryptsetup luksClose ${ownLib.disk.luksName diskId}
sync
'';