Try to get mergerFS working
This commit is contained in:
+1
-1
@@ -16,4 +16,4 @@ HOME_ROUTER_IP="192.168.1.1"
|
||||
HOME_SERVER_IP="192.168.1.5"
|
||||
# SERVICES SETTINGS
|
||||
SELECTED_SERVICES=( "frigate" "gitea" "home-assistant" "immich" "it-tools" \
|
||||
"nextcloud" "passbolt" "pi-hole" )
|
||||
"nextcloud" "passbolt" "pi-hole" "virtualization" )
|
||||
@@ -182,7 +182,7 @@ ls /dev/serial/by-id/ 2>/dev/null | grep -i "zigbee" && TARGET_ZIGBEE_DEVICE=\$(
|
||||
|
||||
TARGET_INTERFACE=\$(ip -4 route show default | awk '{print \$5}' | head -n1)
|
||||
|
||||
if ls -l /sys/class/tpm/tpm0/; then
|
||||
if ls -l /sys/class/tpm/tpm0/ >/dev/null 2>&1; then
|
||||
TARGET_TPM="true"
|
||||
TARGET_TPM_VERSION=\$(cat /sys/class/tpm/tpm0/tpm_version_major)
|
||||
else
|
||||
@@ -527,7 +527,7 @@ EOF
|
||||
(envsubst < "templates/nix-config/disks/content.nix") >> final-nix-config/etc/nixos/disks/disko.nix
|
||||
SNAPRAID_CONTENT_FILES+=" \"/mnt/content-${j}/snapraid.content\""$'\n'
|
||||
SNAPRAID_DATA_DISKS+=" d${j} = \"/mnt/content-${j}\";"$'\n'
|
||||
MERGERFS_DEPENDS+=" \"/mnt/content-${j}\""$'\n'
|
||||
MERGERFS_REQ_DEPS+=" \"x-systemd.requires=/mnt/content-${j}\""$'\n'
|
||||
done
|
||||
echo -e "\n✅ Generated $CONTENT_DISK_NUMBER data disk configuration(s)."
|
||||
j=0
|
||||
@@ -542,7 +542,7 @@ EOF
|
||||
export SNAPRAID_CONTENT_FILES
|
||||
export SNAPRAID_DATA_DISKS
|
||||
export SNAPRAID_PARITY_FILES
|
||||
export MERGERFS_DEPENDS
|
||||
export MERGERFS_REQ_DEPS
|
||||
envsubst < templates/nix-config/disks/snapraid.nix > final-nix-config/etc/nixos/disks/snapraid.nix
|
||||
fi
|
||||
# Close the disko.nix block
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
type = "filesystem";
|
||||
format = "xfs";
|
||||
mountpoint = "/mnt/content-${j}";
|
||||
mountOptions = [ "noauto" "nofail" "x-systemd.automount" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
type = "filesystem";
|
||||
format = "xfs";
|
||||
mountpoint = "/mnt/parity-${j}";
|
||||
mountOptions = [ "noauto" "nofail" "x-systemd.automount" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
"dropcacheonclose=true"
|
||||
"defaults"
|
||||
"noauto"
|
||||
"nofail"
|
||||
"allow_other"
|
||||
"moveonenospc=1"
|
||||
"minfreespace=50G"
|
||||
@@ -18,8 +19,7 @@
|
||||
"fsname=mergerfs_data"
|
||||
"x-mount.mkdir"
|
||||
"x-systemd.automount"
|
||||
"x-systemd.requires=local-fs.target"
|
||||
"x-systemd.after=network-online.target"
|
||||
$MERGERFS_REQ_DEPS
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user