git.iko.soy/typeable/nixpkgs
on master help sign in
nixos: remove dependencies on local-fs.target

Since https://github.com/NixOS/nixpkgs/pull/61321, local-fs.target is part of sysinit.target again, meaning units without DefaultDependencies=no will automatically depend on it, and the manual set dependencies can be dropped.

commitf74735c9d7e7b978827ff17b5f8cb375753dca0b authorFlorian Klink <flokli@flokli.de> dateSun 1 Sep 2019, 03:07 (7 years ago) parent7f42adf
25 files changed+41−51
nixos/modules/services/computing/boinc/client.nix+1−1 nixos/modules/services/desktops/profile-sync-daemon.nix+1−1 nixos/modules/services/hardware/triggerhappy.nix−1 nixos/modules/services/misc/airsonic.nix+1−1 nixos/modules/services/misc/mediatomb.nix+1−1 nixos/modules/services/misc/mwlib.nix+2−3 nixos/modules/services/misc/serviio.nix+8−8 nixos/modules/services/misc/subsonic.nix+1−1 nixos/modules/services/network-filesystems/ceph.nix+11−11 nixos/modules/services/network-filesystems/glusterfs.nix+1−1 nixos/modules/services/network-filesystems/ipfs.nix+3−4 nixos/modules/services/networking/aria2.nix+1−1 nixos/modules/services/networking/logmein-hamachi.nix+1−1 nixos/modules/services/networking/minidlna.nix+1−1 nixos/modules/services/networking/resilio.nix+1−1 nixos/modules/services/scheduling/fcron.nix−1 nixos/modules/services/security/tor.nix−1 nixos/modules/services/security/usbguard.nix+1−1 nixos/modules/services/system/cgmanager.nix−1 nixos/modules/services/system/cloud-init.nix+2−4 nixos/modules/services/torrent/transmission.nix+1−1 nixos/modules/services/x11/xserver.nix+1−1 nixos/modules/virtualisation/azure-agent.nix−1 nixos/modules/virtualisation/azure-image.nix−1 nixos/tests/hocker-fetchdocker/machine.nix+2−2
nixos/modules/services/computing/boinc/client.nix+1−1
@@ -111,7 +111,7 @@ in
111111
112112 systemd.services.boinc = {
113113 description = "BOINC Client";
114− after = ["network.target" "local-fs.target"];
114+ after = ["network.target"];
115115 wantedBy = ["multi-user.target"];
116116 script = ''
117117 ${fhsEnvExecutable} --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag}
nixos/modules/services/desktops/profile-sync-daemon.nix+1−1
@@ -34,7 +34,7 @@ in {
3434 psd = {
3535 enable = true;
3636 description = "Profile Sync daemon";
37− wants = [ "psd-resync.service" "local-fs.target" ];
37+ wants = [ "psd-resync.service" ];
3838 wantedBy = [ "default.target" ];
3939 path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
4040 unitConfig = {
nixos/modules/services/hardware/triggerhappy.nix−1
@@ -102,7 +102,6 @@ in
102102
103103 systemd.services.triggerhappy = {
104104 wantedBy = [ "multi-user.target" ];
105− after = [ "local-fs.target" ];
106105 description = "Global hotkey daemon";
107106 serviceConfig = {
108107 ExecStart = "${pkgs.triggerhappy}/bin/thd ${optionalString (cfg.user != "root") "--user ${cfg.user}"} --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*";
nixos/modules/services/misc/airsonic.nix+1−1
@@ -105,7 +105,7 @@ in {
105105 config = mkIf cfg.enable {
106106 systemd.services.airsonic = {
107107 description = "Airsonic Media Server";
108− after = [ "local-fs.target" "network.target" ];
108+ after = [ "network.target" ];
109109 wantedBy = [ "multi-user.target" ];
110110
111111 preStart = ''
nixos/modules/services/misc/mediatomb.nix+1−1
@@ -259,7 +259,7 @@ in {
259259 config = mkIf cfg.enable {
260260 systemd.services.mediatomb = {
261261 description = "MediaTomb media Server";
262− after = [ "local-fs.target" "network.target" ];
262+ after = [ "network.target" ];
263263 wantedBy = [ "multi-user.target" ];
264264 path = [ pkgs.mediatomb ];
265265 serviceConfig.ExecStart = "${pkgs.mediatomb}/bin/mediatomb -p ${toString cfg.port} ${if cfg.interface!="" then "-e ${cfg.interface}" else ""} ${if cfg.customCfg then "" else "-c ${mtConf}"} -m ${cfg.dataDir}";
nixos/modules/services/misc/mwlib.nix+2−3
@@ -165,7 +165,7 @@ in
165165
166166 }; # options.services
167167
168− config = {
168+ config = {
169169
170170 systemd.services.mwlib-nserve = mkIf cfg.nserve.enable
171171 {
@@ -191,7 +191,6 @@ in
191191 description = "mwlib job queue server";
192192
193193 wantedBy = [ "multi-user.target" ];
194− after = [ "network.target" "local-fs.target" ];
195194
196195 preStart = ''
197196 mkdir -pv '${cfg.qserve.datadir}'
@@ -218,7 +217,7 @@ in
218217 description = "mwlib worker";
219218
220219 wantedBy = [ "multi-user.target" ];
221− after = [ "network.target" "local-fs.target" ];
220+ after = [ "network.target" ];
222221
223222 preStart = ''
224223 mkdir -pv '${cfg.nslave.cachedir}'
nixos/modules/services/misc/serviio.nix+8−8
@@ -10,7 +10,7 @@ let
1010 #!${pkgs.bash}/bin/sh
1111
1212 SERVIIO_HOME=${pkgs.serviio}
13−
13+
1414 # Setup the classpath
1515 SERVIIO_CLASS_PATH="$SERVIIO_HOME/lib/*:$SERVIIO_HOME/config"
1616
@@ -21,13 +21,13 @@ let
2121 # Execute the JVM in the foreground
2222 exec ${pkgs.jre}/bin/java -Xmx512M -Xms20M -XX:+UseG1GC -XX:GCTimeRatio=1 -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 $JAVA_OPTS -classpath "$SERVIIO_CLASS_PATH" org.serviio.MediaServer "$@"
2323 '';
24−
24+
2525in {
2626
2727 ###### interface
2828 options = {
2929 services.serviio = {
30−
30+
3131 enable = mkOption {
3232 type = types.bool;
3333 default = false;
@@ -52,7 +52,7 @@ in {
5252 config = mkIf cfg.enable {
5353 systemd.services.serviio = {
5454 description = "Serviio Media Server";
55− after = [ "local-fs.target" "network.target" ];
55+ after = [ "network.target" ];
5656 wantedBy = [ "multi-user.target" ];
5757 path = [ pkgs.serviio ];
5858 serviceConfig = {
@@ -64,7 +64,7 @@ in {
6464 };
6565
6666 users.users = [
67− {
67+ {
6868 name = "serviio";
6969 group = "serviio";
7070 home = cfg.dataDir;
@@ -75,16 +75,16 @@ in {
7575 ];
7676
7777 users.groups = [
78− { name = "serviio";}
78+ { name = "serviio";}
7979 ];
8080
8181 networking.firewall = {
82− allowedTCPPorts = [
82+ allowedTCPPorts = [
8383 8895 # serve UPnP responses
8484 23423 # console
8585 23424 # mediabrowser
8686 ];
87− allowedUDPPorts = [
87+ allowedUDPPorts = [
8888 1900 # UPnP service discovey
8989 ];
9090 };
nixos/modules/services/misc/subsonic.nix+1−1
@@ -105,7 +105,7 @@ let cfg = config.services.subsonic; in {
105105 config = mkIf cfg.enable {
106106 systemd.services.subsonic = {
107107 description = "Personal media streamer";
108− after = [ "local-fs.target" "network.target" ];
108+ after = [ "network.target" ];
109109 wantedBy = [ "multi-user.target" ];
110110 script = ''
111111 ${pkgs.jre}/bin/java -Xmx${toString cfg.maxMemory}m \
nixos/modules/services/network-filesystems/ceph.nix+11−11
@@ -9,7 +9,7 @@ let
99 translateOption = replaceStrings upperChars (map (s: " ${s}") lowerChars);
1010 generateDaemonList = (daemonType: daemons: extraServiceConfig:
1111 mkMerge (
12− map (daemon:
12+ map (daemon:
1313 { "ceph-${daemonType}-${daemon}" = generateServiceFile daemonType daemon cfg.global.clusterName ceph extraServiceConfig; }
1414 ) daemons
1515 )
@@ -17,8 +17,8 @@ let
1717 generateServiceFile = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: {
1818 enable = true;
1919 description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}";
20− after = [ "network-online.target" "local-fs.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target";
21− wants = [ "network-online.target" "local-fs.target" "time-sync.target" ];
20+ after = [ "network-online.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target";
21+ wants = [ "network-online.target" "time-sync.target" ];
2222 partOf = [ "ceph-${daemonType}.target" ];
2323 wantedBy = [ "ceph-${daemonType}.target" ];
2424
@@ -41,7 +41,7 @@ let
4141 daemonPath="/var/lib/ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}"
4242 if [ ! -d ''$daemonPath ]; then
4343 mkdir -m 755 -p ''$daemonPath
44− chown -R ceph:ceph ''$daemonPath
44+ chown -R ceph:ceph ''$daemonPath
4545 fi
4646 '';
4747 } // optionalAttrs (daemonType == "osd") { path = [ pkgs.getopt ]; }
@@ -55,7 +55,7 @@ let
5555 };
5656 }
5757 );
58−in
58+in
5959{
6060 options.services.ceph = {
6161 # Ceph has a monolithic configuration file but different sections for
@@ -86,7 +86,7 @@ in
8686 type = with types; nullOr commas;
8787 default = null;
8888 example = ''
89− node0, node1, node2
89+ node0, node1, node2
9090 '';
9191 description = ''
9292 List of hosts that will be used as monitors at startup.
@@ -313,9 +313,9 @@ in
313313 }
314314 ];
315315
316− warnings = optional (cfg.global.monInitialMembers == null)
316+ warnings = optional (cfg.global.monInitialMembers == null)
317317 ''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function'';
318−
318+
319319 environment.etc."ceph/ceph.conf".text = let
320320 # Translate camelCaseOptions to the expected camel case option for ceph.conf
321321 translatedGlobalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) cfg.global;
@@ -344,13 +344,13 @@ in
344344 };
345345
346346 systemd.services = let
347− services = []
348− ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; })
347+ services = []
348+ ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; })
349349 ++ optional cfg.mds.enable (generateDaemonList "mds" cfg.mds.daemons { StartLimitBurst = "3"; })
350350 ++ optional cfg.osd.enable (generateDaemonList "osd" cfg.osd.daemons { StartLimitBurst = "30"; RestartSec = "20s"; })
351351 ++ optional cfg.rgw.enable (generateDaemonList "rgw" cfg.rgw.daemons { })
352352 ++ optional cfg.mgr.enable (generateDaemonList "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; });
353− in
353+ in
354354 mkMerge services;
355355
356356 systemd.targets = let
nixos/modules/services/network-filesystems/glusterfs.nix+1−1
@@ -156,7 +156,7 @@ in
156156 wantedBy = [ "multi-user.target" ];
157157
158158 requires = lib.optional cfg.useRpcbind "rpcbind.service";
159− after = [ "network.target" "local-fs.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service";
159+ after = [ "network.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service";
160160
161161 preStart = ''
162162 install -m 0755 -d /var/log/glusterfs
nixos/modules/services/network-filesystems/ipfs.nix+3−4
@@ -236,7 +236,6 @@ in {
236236 systemd.services.ipfs-init = recursiveUpdate commonEnv {
237237 description = "IPFS Initializer";
238238
239− after = [ "local-fs.target" ];
240239 before = [ "ipfs.service" "ipfs-offline.service" "ipfs-norouting.service" ];
241240
242241 script = ''
@@ -263,21 +262,21 @@ in {
263262 systemd.services.ipfs = recursiveUpdate baseService {
264263 description = "IPFS Daemon";
265264 wantedBy = mkIf (cfg.defaultMode == "online") [ "multi-user.target" ];
266− after = [ "network.target" "local-fs.target" "ipfs-init.service" ];
265+ after = [ "network.target" "ipfs-init.service" ];
267266 conflicts = [ "ipfs-offline.service" "ipfs-norouting.service"];
268267 };
269268
270269 systemd.services.ipfs-offline = recursiveUpdate baseService {
271270 description = "IPFS Daemon (offline mode)";
272271 wantedBy = mkIf (cfg.defaultMode == "offline") [ "multi-user.target" ];
273− after = [ "local-fs.target" "ipfs-init.service" ];
272+ after = [ "ipfs-init.service" ];
274273 conflicts = [ "ipfs.service" "ipfs-norouting.service"];
275274 };
276275
277276 systemd.services.ipfs-norouting = recursiveUpdate baseService {
278277 description = "IPFS Daemon (no routing mode)";
279278 wantedBy = mkIf (cfg.defaultMode == "norouting") [ "multi-user.target" ];
280− after = [ "local-fs.target" "ipfs-init.service" ];
279+ after = [ "ipfs-init.service" ];
281280 conflicts = [ "ipfs.service" "ipfs-offline.service"];
282281 };
283282
nixos/modules/services/networking/aria2.nix+1−1
@@ -109,7 +109,7 @@ in
109109
110110 systemd.services.aria2 = {
111111 description = "aria2 Service";
112− after = [ "local-fs.target" "network.target" ];
112+ after = [ "network.target" ];
113113 wantedBy = [ "multi-user.target" ];
114114 preStart = ''
115115 if [[ ! -e "${sessionFile}" ]]
nixos/modules/services/networking/logmein-hamachi.nix+1−1
@@ -35,7 +35,7 @@ in
3535 description = "LogMeIn Hamachi Daemon";
3636
3737 wantedBy = [ "multi-user.target" ];
38− after = [ "network.target" "local-fs.target" ];
38+ after = [ "network.target" ];
3939
4040 serviceConfig = {
4141 Type = "forking";
nixos/modules/services/networking/minidlna.nix+1−1
@@ -96,7 +96,7 @@ in
9696 { description = "MiniDLNA Server";
9797
9898 wantedBy = [ "multi-user.target" ];
99− after = [ "network.target" "local-fs.target" ];
99+ after = [ "network.target" ];
100100
101101 serviceConfig =
102102 { User = "minidlna";
nixos/modules/services/networking/resilio.nix+1−1
@@ -249,7 +249,7 @@ in
249249 systemd.services.resilio = with pkgs; {
250250 description = "Resilio Sync Service";
251251 wantedBy = [ "multi-user.target" ];
252− after = [ "network.target" "local-fs.target" ];
252+ after = [ "network.target" ];
253253 serviceConfig = {
254254 Restart = "on-abort";
255255 UMask = "0002";
nixos/modules/services/scheduling/fcron.nix−1
@@ -143,7 +143,6 @@ in
143143 };
144144 systemd.services.fcron = {
145145 description = "fcron daemon";
146− after = [ "local-fs.target" ];
147146 wantedBy = [ "multi-user.target" ];
148147
149148 path = [ pkgs.fcron ];
nixos/modules/services/security/tor.nix−1
@@ -722,7 +722,6 @@ in
722722 systemd.services.tor-init =
723723 { description = "Tor Daemon Init";
724724 wantedBy = [ "tor.service" ];
725− after = [ "local-fs.target" ];
726725 script = ''
727726 install -m 0700 -o tor -g tor -d ${torDirectory} ${torDirectory}/onion
728727 install -m 0750 -o tor -g tor -d ${torRunDirectory}
nixos/modules/services/security/usbguard.nix+1−1
@@ -195,7 +195,7 @@ in {
195195 description = "USBGuard daemon";
196196
197197 wantedBy = [ "basic.target" ];
198− wants = [ "systemd-udevd.service" "local-fs.target" ];
198+ wants = [ "systemd-udevd.service" ];
199199
200200 # make sure an empty rule file and required directories exist
201201 preStart = ''
nixos/modules/services/system/cgmanager.nix−1
@@ -14,7 +14,6 @@ in {
1414 config = mkIf cfg.enable {
1515 systemd.services.cgmanager = {
1616 wantedBy = [ "multi-user.target" ];
17− after = [ "local-fs.target" ];
1817 description = "Cgroup management daemon";
1918 restartIfChanged = false;
2019 serviceConfig = {
nixos/modules/services/system/cloud-init.nix+2−4
@@ -112,8 +112,6 @@ in
112112 systemd.services.cloud-init-local =
113113 { description = "Initial cloud-init job (pre-networking)";
114114 wantedBy = [ "multi-user.target" ];
115− wants = [ "local-fs.target" ];
116− after = [ "local-fs.target" ];
117115 path = path;
118116 serviceConfig =
119117 { Type = "oneshot";
@@ -127,9 +125,9 @@ in
127125 systemd.services.cloud-init =
128126 { description = "Initial cloud-init job (metadata service crawler)";
129127 wantedBy = [ "multi-user.target" ];
130− wants = [ "local-fs.target" "network-online.target" "cloud-init-local.service"
128+ wants = [ "network-online.target" "cloud-init-local.service"
131129 "sshd.service" "sshd-keygen.service" ];
132− after = [ "local-fs.target" "network-online.target" "cloud-init-local.service" ];
130+ after = [ "network-online.target" "cloud-init-local.service" ];
133131 before = [ "sshd.service" "sshd-keygen.service" ];
134132 requires = [ "network.target "];
135133 path = path;
nixos/modules/services/torrent/transmission.nix+1−1
@@ -102,7 +102,7 @@ in
102102 config = mkIf cfg.enable {
103103 systemd.services.transmission = {
104104 description = "Transmission BitTorrent Service";
105− after = [ "local-fs.target" "network.target" ] ++ optional apparmor "apparmor.service";
105+ after = [ "network.target" ] ++ optional apparmor "apparmor.service";
106106 requires = mkIf apparmor [ "apparmor.service" ];
107107 wantedBy = [ "multi-user.target" ];
108108
nixos/modules/services/x11/xserver.nix+1−1
@@ -659,7 +659,7 @@ in
659659 systemd.services.display-manager =
660660 { description = "X11 Server";
661661
662− after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" "systemd-logind.service" ];
662+ after = [ "systemd-udev-settle.service" "acpid.service" "systemd-logind.service" ];
663663 wants = [ "systemd-udev-settle.service" ];
664664
665665 restartIfChanged = false;
nixos/modules/virtualisation/azure-agent.nix−1
@@ -166,7 +166,6 @@ in
166166
167167 wantedBy = [ "sshd.service" "waagent.service" ];
168168 before = [ "sshd.service" "waagent.service" ];
169− after = [ "local-fs.target" ];
170169
171170 path = [ pkgs.coreutils ];
172171 script =
nixos/modules/virtualisation/azure-image.nix−1
@@ -26,7 +26,6 @@ in
2626
2727 wantedBy = [ "sshd.service" "waagent.service" ];
2828 before = [ "sshd.service" "waagent.service" ];
29− after = [ "local-fs.target" ];
3029
3130 path = [ pkgs.coreutils ];
3231 script =
nixos/tests/hocker-fetchdocker/machine.nix+2−2
@@ -11,8 +11,8 @@
1111 systemd.services.docker-load-fetchdocker-image = {
1212 description = "Docker load hello-world-container";
1313 wantedBy = [ "multi-user.target" ];
14− wants = [ "docker.service" "local-fs.target" ];
15− after = [ "docker.service" "local-fs.target" ];
14+ wants = [ "docker.service" ];
15+ after = [ "docker.service" ];
1616
1717 script = ''
1818 ${pkgs.hello-world-container}/compositeImage.sh | ${pkgs.docker}/bin/docker load