JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Systemd unit names can contain Nix-illegal characters, so don't include them

Browse Source
This commit is contained in:
Eelco Dolstra 2012-10-12 17:32:05 -04:00
parent 3f6d53cc97
commit 12d1cd87ce
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,28 +224,28 @@ let
${optionalString (!def.restartIfChanged) "X-RestartIfChanged=false"}
${optionalString (def.preStart != "") ''
ExecStartPre=${makeJobScript "${name}-prestart.sh" ''
ExecStartPre=${makeJobScript "prestart.sh" ''
#! ${pkgs.stdenv.shell} -e
${def.preStart}
''}
''}
${optionalString (def.script != "") ''
ExecStart=${makeJobScript "${name}.sh" ''
ExecStart=${makeJobScript "start.sh" ''
#! ${pkgs.stdenv.shell} -e
${def.script}
''}
''}
${optionalString (def.postStart != "") ''
ExecStartPost=${makeJobScript "${name}-poststart.sh" ''
ExecStartPost=${makeJobScript "poststart.sh" ''
#! ${pkgs.stdenv.shell} -e
${def.postStart}
''}
''}
${optionalString (def.postStop != "") ''
ExecStopPost=${makeJobScript "${name}-poststop.sh" ''
ExecStopPost=${makeJobScript "poststop.sh" ''
#! ${pkgs.stdenv.shell} -e
${def.postStop}
''}
@ -311,7 +311,7 @@ let
ln -s ${cfg.defaultUnit} $out/default.target
#ln -s ../getty@tty1.service $out/multi-user.target.wants/
ln -s ../remote-fs.target ../network.target ../swap.target $out/multi-user.target.wants/
ln -s ../local-fs.target ../remote-fs.target ../network.target ../swap.target $out/multi-user.target.wants/
''; # */
in