NixOS/disko
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Escape ZFS args

Browse Source
This commit is contained in:
Josh Gustafson
2026-03-02 09:31:30 -07:00
parent 71a3fc97d8
commit dff80bbcd9
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/types/zfs_fs.nix
+7 -5
View File
@@ -91,12 +91,14 @@
updateOptions = builtins.removeAttrs createOptions onetimeProperties;
in
''
if ! zfs get type ${config._name} >/dev/null 2>&1; then
if ! zfs get type "${config._name}" >/dev/null 2>&1; then
${
if config._createFilesystem then
''
zfs create -up ${config._name} \
${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "-o ${n}=${v}") (createOptions))}
zfs create -up "${config._name}" \
${lib.concatStringsSep " " (
lib.mapAttrsToList (n: v: "-o ${n}=${lib.escapeShellArg v}") (createOptions)
)}
''
else
''
@@ -107,8 +109,8 @@
${lib.optionalString (updateOptions != { }) ''
else
zfs set -u ${
lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${v}") updateOptions)
} ${config._name}
lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") updateOptions)
} "${config._name}"
''}
fi
'';
lib/types/zfs_volume.nix
+5 -1
View File
@@ -63,7 +63,11 @@
default = ''
if ! zfs get type "${config._parent.name}/${config.name}" >/dev/null 2>&1; then
zfs create "${config._parent.name}/${config.name}" \
${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "-o ${n}=${v}") config.options)} \
${
lib.concatStringsSep " " (
lib.mapAttrsToList (n: v: "-o ${n}=${lib.escapeShellArg v}") config.options
)
} \
-V ${config.size} ${toString (builtins.map lib.escapeShellArg config.extraArgs)}
zvol_wait
partprobe "/dev/zvol/${config._parent.name}/${config.name}"
lib/types/zpool.nix
+10 -2
View File
@@ -377,8 +377,16 @@ in
else
""
} \
${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "-o ${n}=${v}") config.options)} \
${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "-O ${n}=${v}") config.rootFsOptions)} \
${
lib.concatStringsSep " " (
lib.mapAttrsToList (n: v: "-o ${n}=${lib.escapeShellArg v}") config.options
)
} \
${
lib.concatStringsSep " " (
lib.mapAttrsToList (n: v: "-O ${n}=${lib.escapeShellArg v}") config.rootFsOptions
)
} \
''${topology:+ $topology}
if [[ $(zfs get -H mounted "${config.name}" | cut -f3) == "yes" ]]; then
zfs unmount "${config.name}"