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 }: ''
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}" \