mirror of
https://github.com/nix-community/disko.git
synced 2024-09-11 06:25:33 +03:00
fix mdadm mounting, move test to mdadm test
This commit is contained in:
parent
6b0b20da18
commit
1237ac36db
@ -137,7 +137,7 @@ let
|
||||
};
|
||||
|
||||
mount.devices = q: x: let
|
||||
z = foldl' recursiveUpdate {} (mapAttrsToList (name: mount-f { device = "/dev/${name}"; }) x.content);
|
||||
z = foldl' recursiveUpdate {} (mapAttrsToList (name: mount-f { device = "/dev/${name}"; inherit name; }) x.content);
|
||||
# attrValues returns values sorted by name. This is important, because it
|
||||
# ensures that "/" is processed before "/foo" etc.
|
||||
in ''
|
||||
@ -168,8 +168,9 @@ let
|
||||
|
||||
mount.noop = q: x: {};
|
||||
|
||||
mount.mdadm = q: x:
|
||||
mount-f { device = "/dev/md/${q.name}"; } x.content;
|
||||
# TODO maybe we need to do something here?
|
||||
mount.mdadm = mount.noop;
|
||||
mount.mdraid = mount.noop;
|
||||
|
||||
mount.partition = q: x:
|
||||
|
@ -53,7 +53,6 @@
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
};
|
||||
};
|
||||
};
|
@ -7,7 +7,7 @@ let
|
||||
inherit pkgs;
|
||||
inherit (pkgs) system;
|
||||
};
|
||||
disko-config = import ../example/raid.nix;
|
||||
disko-config = import ../example/mdadm.nix;
|
||||
tsp-create = pkgs.writeScript "create" ((pkgs.callPackage ../. {}).create disko-config);
|
||||
tsp-mount = pkgs.writeScript "mount" ((pkgs.callPackage ../. {}).mount disko-config);
|
||||
in makeTest' {
|
||||
@ -34,5 +34,6 @@ in makeTest' {
|
||||
machine.succeed("${tsp-mount}");
|
||||
machine.succeed("${tsp-mount}"); # verify that the command is idempotent
|
||||
machine.succeed("test -b /dev/md/raid1");
|
||||
machine.succeed("grep -qs '/mnt/raid' /proc/mounts");
|
||||
'';
|
||||
}
|
Loading…
Reference in New Issue
Block a user