nixos/autofs: revive and update to systemd
This commit is contained in:
parent
360e8008f2
commit
9800862397
|
@ -188,7 +188,7 @@
|
||||||
./services/mail/postfix.nix
|
./services/mail/postfix.nix
|
||||||
./services/mail/spamassassin.nix
|
./services/mail/spamassassin.nix
|
||||||
./services/misc/apache-kafka.nix
|
./services/misc/apache-kafka.nix
|
||||||
#./services/misc/autofs.nix
|
./services/misc/autofs.nix
|
||||||
./services/misc/canto-daemon.nix
|
./services/misc/canto-daemon.nix
|
||||||
./services/misc/calibre-server.nix
|
./services/misc/calibre-server.nix
|
||||||
./services/misc/cpuminer-cryptonight.nix
|
./services/misc/cpuminer-cryptonight.nix
|
||||||
|
|
|
@ -71,48 +71,17 @@ in
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|
||||||
environment.etc = singleton
|
|
||||||
{ target = "auto.master";
|
|
||||||
source = pkgs.writeText "auto.master" cfg.autoMaster;
|
|
||||||
};
|
|
||||||
|
|
||||||
boot.kernelModules = [ "autofs4" ];
|
boot.kernelModules = [ "autofs4" ];
|
||||||
|
|
||||||
jobs.autofs =
|
systemd.services.autofs =
|
||||||
{ description = "Filesystem automounter";
|
{ description = "Filesystem automounter";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
after = [ "network.target" ];
|
||||||
|
|
||||||
startOn = "started network-interfaces";
|
serviceConfig = {
|
||||||
stopOn = "stopping network-interfaces";
|
ExecStart = "${pkgs.autofs5}/sbin/automount ${if cfg.debug then "-d" else ""} -f -t ${builtins.toString cfg.timeout} ${autoMaster} ${if cfg.debug then "-l7" else ""}";
|
||||||
|
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||||
path = [ pkgs.nfs-utils pkgs.sshfsFuse ];
|
};
|
||||||
|
|
||||||
preStop =
|
|
||||||
''
|
|
||||||
set -e; while :; do pkill -TERM automount; sleep 1; done
|
|
||||||
'';
|
|
||||||
|
|
||||||
# automount doesn't clean up when receiving SIGKILL.
|
|
||||||
# umount -l should unmount the directories recursively when they are no longer used
|
|
||||||
# It does, but traces are left in /etc/mtab. So unmount recursively..
|
|
||||||
postStop =
|
|
||||||
''
|
|
||||||
PATH=${pkgs.gnused}/bin:${pkgs.coreutils}/bin
|
|
||||||
exec &> /tmp/logss
|
|
||||||
# double quote for sed:
|
|
||||||
escapeSpaces(){ sed 's/ /\\\\040/g'; }
|
|
||||||
unescapeSpaces(){ sed 's/\\040/ /g'; }
|
|
||||||
sed -n 's@^\s*\(\([^\\ ]\|\\ \)*\)\s.*@\1@p' ${autoMaster} | sed 's/[\\]//' | while read mountPoint; do
|
|
||||||
sed -n "s@[^ ]\+\s\+\($(echo "$mountPoint"| escapeSpaces)[^ ]*\).*@\1@p" /proc/mounts | sort -r | unescapeSpaces| while read smountP; do
|
|
||||||
${pkgs.utillinux}/bin/umount -l "$smountP" || true
|
|
||||||
done
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
script =
|
|
||||||
''
|
|
||||||
${if cfg.debug then "exec &> /var/log/autofs" else ""}
|
|
||||||
exec ${pkgs.autofs5}/sbin/automount ${if cfg.debug then "-d" else ""} -f -t ${builtins.toString cfg.timeout} "${autoMaster}" ${if cfg.debug then "-l7" else ""}
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue