nix-community/disko
1
1
Fork 0
mirror of https://github.com/nix-community/disko.git synced 2024-09-11 06:25:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from nix-community/change-mount-code

Browse Source 
use findmnt and mount with X-mount.mkdir
This commit is contained in:
Jörg Thalheim 2022-08-17 15:36:20 +01:00 committed by GitHub
commit e97ddb5138
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/default.nix
View File

@ -88,9 +88,8 @@ let {
mount.filesystem = q: x: {
fs.${x.mountpoint} = ''
if ! [ "$(mount | sed -n 's:\([^ ]\+\) on /mnt${x.mountpoint} .*:\1:p')" = ${q.device} ]; then
mkdir -p /mnt${x.mountpoint}
mount ${q.device} /mnt${x.mountpoint}
if ! findmnt "${q.device}" "/mnt${x.mountpoint}" > /dev/null 2>&1; then
mount "${q.device}" "/mnt${x.mountpoint}" -o X-mount.mkdir
fi
'';
};

7
tests/test.nix
View File

@ -85,6 +85,8 @@ let
};
};
};
tsp-create = pkgs.writeScript "create" ((pkgs.callPackage ../. {}).create disko-config);
tsp-mount = pkgs.writeScript "mount" ((pkgs.callPackage ../. {}).mount disko-config);
in makeTest' {
name = "disko";
@ -105,8 +107,9 @@ in makeTest' {
testScript = ''
machine.succeed("echo 'secret' > /tmp/secret.key");
machine.succeed("${pkgs.writeScript "create" ((pkgs.callPackage ../. {}).create disko-config)}");
machine.succeed("${pkgs.writeScript "mount" ((pkgs.callPackage ../. {}).mount disko-config)}");
machine.succeed("${tsp-create}");
machine.succeed("${tsp-mount}");
machine.succeed("${tsp-mount}"); # verify that the command is idempotent
machine.succeed("test -b /dev/mapper/pool-raw");
'';
}