refactor: utillinux -> util-linux

This commit is contained in:
Bernardo Meurer 2022-01-30 18:22:23 -08:00
parent 406924e62e
commit 3fe959d3dc
2 changed files with 3 additions and 3 deletions

View file

@ -198,7 +198,7 @@ in
Type = "forking";
ExecStart = "${startScript}";
ExecStop = "${stopScript}";
Environment = "PATH=${makeBinPath [ pkgs.coreutils pkgs.utillinux pkgs.gnugrep pkgs.bindfs ]}:/run/wrappers/bin";
Environment = "PATH=${makeBinPath [ pkgs.coreutils pkgs.util-linux pkgs.gnugrep pkgs.bindfs ]}:/run/wrappers/bin";
};
};
};
@ -236,7 +236,7 @@ in
dir;
targetDir = escapeShellArg (concatPaths [ persistentStoragePath dir ]);
mountPoint = escapeShellArg (concatPaths [ config.home.homeDirectory mountDir ]);
mount = "${pkgs.utillinux}/bin/mount";
mount = "${pkgs.util-linux}/bin/mount";
bindfsOptions = concatStringsSep "," (
optional (!cfg.${persistentStoragePath}.allowOther) "no-allow-other"
++ optional (versionAtLeast pkgs.bindfs.version "1.14.9") "fsname=${targetDir}"

View file

@ -297,7 +297,7 @@ in
description = "Bind mount or link ${targetFile} to ${mountPoint}";
wantedBy = [ "local-fs.target" ];
before = [ "local-fs.target" ];
path = [ pkgs.utillinux ];
path = [ pkgs.util-linux ];
unitConfig.DefaultDependencies = false;
serviceConfig = {
Type = "oneshot";