mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00
Code Activity

fix(microvms): fix ensure chmod failure

Browse source
This commit is contained in:
oddlama 2023-06-01 17:01:18 +02:00
parent df2657bb1c
commit a7c1fb016b
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
2 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

55
modules/microvms.nix
View file

@ -48,47 +48,42 @@
# Ensure that the zfs dataset exists before it is mounted. # Ensure that the zfs dataset exists before it is mounted.
systemd.services = let systemd.services = let
fsMountUnit = "${utils.escapeSystemdPath vmCfg.zfs.mountpoint}.mount"; fsMountUnit = "${utils.escapeSystemdPath vmCfg.zfs.mountpoint}.mount";
poolDataset = "${vmCfg.zfs.pool}/${vmCfg.zfs.dataset}";
diskoDataset = config.disko.devices.zpool.${vmCfg.zfs.pool}.datasets.${vmCfg.zfs.dataset};
createDatasetScript = pkgs.writeShellScript "create-microvm-${vmName}-zfs-dataset" ''
export PATH=${makeBinPath (diskoDataset._pkgs pkgs)}":$PATH"
if ! ${pkgs.zfs}/bin/zfs list -H -o type ${escapeShellArg poolDataset} &>/dev/null ; then
${diskoDataset._create {zpool = vmCfg.zfs.pool;}}
fi
chmod 700 ${escapeShellArg vmCfg.zfs.mountpoint}
'';
in in
mkIf vmCfg.zfs.enable { mkIf vmCfg.zfs.enable {
# Ensure that the zfs dataset exists before it is mounted. # Ensure that the zfs dataset exists before it is mounted.
"zfs-ensure-${utils.escapeSystemdPath vmCfg.zfs.mountpoint}" = let "zfs-ensure-${utils.escapeSystemdPath vmCfg.zfs.mountpoint}" = {
fsMountUnit = "${utils.escapeSystemdPath vmCfg.zfs.mountpoint}.mount"; wantedBy = [fsMountUnit];
poolDataset = "${vmCfg.zfs.pool}/${vmCfg.zfs.dataset}"; before = [fsMountUnit];
diskoDataset = config.disko.devices.zpool.${vmCfg.zfs.pool}.datasets.${vmCfg.zfs.dataset}; after = [
createDatasetScript = pkgs.writeShellScript "create-microvm-${vmName}-zfs-dataset" '' "zfs-import-${utils.escapeSystemdPath vmCfg.zfs.pool}.service"
"zfs-mount.target"
];
unitConfig.DefaultDependencies = "no";
serviceConfig.Type = "oneshot";
script = let
poolDataset = "${vmCfg.zfs.pool}/${vmCfg.zfs.dataset}";
diskoDataset = config.disko.devices.zpool.${vmCfg.zfs.pool}.datasets.${vmCfg.zfs.dataset};
in ''
export PATH=${makeBinPath [pkgs.zfs]}":$PATH" export PATH=${makeBinPath [pkgs.zfs]}":$PATH"
if ! zfs list -H -o type ${escapeShellArg poolDataset} &>/dev/null ; then if ! zfs list -H -o type ${escapeShellArg poolDataset} &>/dev/null ; then
${diskoDataset._create {zpool = vmCfg.zfs.pool;}} ${diskoDataset._create {zpool = vmCfg.zfs.pool;}}
fi fi
'';
};
# Ensure that the zfs dataset has the correct permissions when mounted
"zfs-chown-${utils.escapeSystemdPath vmCfg.zfs.mountpoint}" = {
after = [fsMountUnit];
unitConfig.DefaultDependencies = "no";
serviceConfig.Type = "oneshot";
script = ''
chmod 700 ${escapeShellArg vmCfg.zfs.mountpoint} chmod 700 ${escapeShellArg vmCfg.zfs.mountpoint}
''; '';
in };
mkIf vmCfg.zfs.enable {
wantedBy = [fsMountUnit];
before = [fsMountUnit];
after = [
"zfs-import-${utils.escapeSystemdPath vmCfg.zfs.pool}.service"
"zfs-mount.target"
];
unitConfig.DefaultDependencies = "no";
serviceConfig = {
Type = "oneshot";
ExecStart = "${createDatasetScript}";
};
};
"microvm@${vmName}" = { "microvm@${vmName}" = {
requires = [fsMountUnit]; requires = [fsMountUnit "zfs-chown-${utils.escapeSystemdPath vmCfg.zfs.mountpoint}.service"];
after = [fsMountUnit]; after = [fsMountUnit "zfs-chown-${utils.escapeSystemdPath vmCfg.zfs.mountpoint}.service"];
}; };
}; };

2
nix/lib.nix
View file

@ -189,7 +189,7 @@ in rec {
filesystem = mountpoint: { filesystem = mountpoint: {
type = "zfs_fs"; type = "zfs_fs";
options = { options = {
canmount = "on"; canmount = "noauto";
inherit mountpoint; inherit mountpoint;
}; };
# Required to add dependencies for initrd # Required to add dependencies for initrd