technofab/disko
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/disko.git synced 2025-12-11 23:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: create all subvolumes

Browse source
This commit is contained in:
lassulus 2023-06-04 08:58:37 +02:00
parent 40f3218b14
commit 7be0f0cab5
2 changed files with 5 additions and 3 deletions
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 }: '' default = { dev }: ''
mkfs.btrfs ${dev} ${toString config.extraArgs} mkfs.btrfs ${dev} ${toString config.extraArgs}
${lib.concatMapStrings (subvol: '' ${lib.concatMapStrings (subvol: ''
MNTPOINT=$(mktemp -d)
( (
MNTPOINT=$(mktemp -d)
mount ${dev} "$MNTPOINT" -o subvol=/ mount ${dev} "$MNTPOINT" -o subvol=/
trap 'umount $MNTPOINT; rm -rf $MNTPOINT' EXIT trap 'umount $MNTPOINT; rm -rf $MNTPOINT' EXIT
btrfs subvolume create "$MNTPOINT"/${subvol.name} ${toString subvol.extraArgs} btrfs subvolume create "$MNTPOINT"/${subvol.name} ${toString subvol.extraArgs}
@ -89,7 +89,7 @@
else null; else null;
in in
lib.optionalAttrs (mountpoint != null) { lib.optionalAttrs (mountpoint != null) {
fs.${mountpoint} = '' ${mountpoint} = ''
if ! findmnt ${dev} "${rootMountPoint}${mountpoint}" > /dev/null 2>&1; then if ! findmnt ${dev} "${rootMountPoint}${mountpoint}" > /dev/null 2>&1; then
mount ${dev} "${rootMountPoint}${mountpoint}" \ mount ${dev} "${rootMountPoint}${mountpoint}" \
${lib.concatMapStringsSep " " (opt: "-o ${opt}") (subvol.mountOptions ++ [ "subvol=${subvol.name}" ])} \ ${lib.concatMapStringsSep " " (opt: "-o ${opt}") (subvol.mountOptions ++ [ "subvol=${subvol.name}" ])} \
@ -101,7 +101,7 @@
config.subvolumes; config.subvolumes;
in in
{ {
fs = subvolMounts.fs // lib.optionalAttrs (config.mountpoint != null) { fs = subvolMounts // lib.optionalAttrs (config.mountpoint != null) {
${config.mountpoint} = '' ${config.mountpoint} = ''
if ! findmnt ${dev} "${rootMountPoint}${config.mountpoint}" > /dev/null 2>&1; then if ! findmnt ${dev} "${rootMountPoint}${config.mountpoint}" > /dev/null 2>&1; then
mount ${dev} "${rootMountPoint}${config.mountpoint}" \ mount ${dev} "${rootMountPoint}${config.mountpoint}" \

2
tests/btrfs-subvolumes.nix
View file

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