Mirrors/disko
2
0
Fork 0
mirror of https://github.com/nix-community/disko synced 2024-11-10 06:14:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #252

Browse source 
252: btrfs: create all subvolumes r=Lassulus a=Lassulus



Co-authored-by: lassulus <git@lassul.us>
This commit is contained in:
bors[bot] 2023-06-04 11:15:28 +00:00 committed by GitHub
commit fc52585e38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/types/btrfs.nix
View file

@ -67,8 +67,8 @@
default = { dev }: ''
mkfs.btrfs ${dev} ${toString config.extraArgs}
${lib.concatMapStrings (subvol: ''
MNTPOINT=$(mktemp -d)
(
MNTPOINT=$(mktemp -d)
mount ${dev} "$MNTPOINT" -o subvol=/
trap 'umount $MNTPOINT; rm -rf $MNTPOINT' EXIT
btrfs subvolume create "$MNTPOINT"/${subvol.name} ${toString subvol.extraArgs}
@ -89,7 +89,7 @@
else null;
in
lib.optionalAttrs (mountpoint != null) {
fs.${mountpoint} = ''
${mountpoint} = ''
if ! findmnt ${dev} "${rootMountPoint}${mountpoint}" > /dev/null 2>&1; then
mount ${dev} "${rootMountPoint}${mountpoint}" \
${lib.concatMapStringsSep " " (opt: "-o ${opt}") (subvol.mountOptions ++ [ "subvol=${subvol.name}" ])} \
@ -101,7 +101,7 @@
config.subvolumes;
in
{
fs = subvolMounts.fs // lib.optionalAttrs (config.mountpoint != null) {
fs = subvolMounts // lib.optionalAttrs (config.mountpoint != null) {
${config.mountpoint} = ''
if ! findmnt ${dev} "${rootMountPoint}${config.mountpoint}" > /dev/null 2>&1; then
mount ${dev} "${rootMountPoint}${config.mountpoint}" \

2
tests/btrfs-subvolumes.nix
View file

@ -7,6 +7,8 @@ makeDiskoTest {
extraTestScript = ''
machine.succeed("test -e /test");
machine.succeed("btrfs subvolume list / | grep -qs 'path test$'");
machine.succeed("btrfs subvolume list / | grep -qs 'path nix$'");
machine.succeed("btrfs subvolume list / | grep -qs 'path home$'");
'';
}