ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-06 13:16:40 +03:00
Code Issues Projects Releases Wiki Activity

Move fs.target to filesystems.nix

Browse Source
This commit is contained in:
Eelco Dolstra 2012-10-12 15:08:44 -04:00
parent 7ce9893bef
commit b968244aa1
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/system/boot/systemd.nix
View File

@ -158,13 +158,6 @@ let
KillSignal=SIGHUP KillSignal=SIGHUP
''; '';
fsTarget =
''
[Unit]
Description=All File Systems
Wants=local-fs.target remote-fs.target
'';
makeJobScript = name: content: "${pkgs.writeScriptBin name content}/bin/${name}"; makeJobScript = name: content: "${pkgs.writeScriptBin name content}/bin/${name}";
unitConfig = { name, config, ... }: { unitConfig = { name, config, ... }: {
@ -423,7 +416,6 @@ in
boot.systemd.units = boot.systemd.units =
{ "rescue.service".text = rescueService; } { "rescue.service".text = rescueService; }
// { "fs.target" = { text = fsTarget; wantedBy = [ "multi-user.target" ]; }; }
// mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets
// mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services
// mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets; // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets;

6
modules/tasks/filesystems.nix
View File

@ -180,6 +180,12 @@ in
target = "fstab"; target = "fstab";
}; };
# Provide a target that pulls in all filesystems.
boot.systemd.targets.fs =
{ description = "All File Systems";
wants = [ "local-fs.target" "remote-fs.target" ];
};
/* /*
jobs.mountall = jobs.mountall =
{ startOn = "started udev or config-changed"; { startOn = "started udev or config-changed";