|
65 | 65 | <filename><replaceable>slice</replaceable>.slice</filename>, |
66 | 66 | <filename><replaceable>scope</replaceable>.scope</filename></para> |
67 | 67 |
|
68 | | - <para><literallayout><filename>/etc/systemd/system/*</filename> |
| 68 | + <para><literallayout><filename>/etc/systemd/system.control/*</filename> |
| 69 | +<filename>/run/systemd/system.control/*</filename> |
| 70 | +<filename>/run/systemd/transient/*</filename> |
| 71 | +<filename>/run/systemd/generator.early/*</filename> |
| 72 | +<filename>/etc/systemd/system/*</filename> |
69 | 73 | <filename>/run/systemd/system/*</filename> |
70 | | -<filename>/usr/lib/systemd/system/*</filename> |
| 74 | +<filename>/run/systemd/generator/*</filename> |
71 | 75 | <filename>…</filename> |
| 76 | +<filename>/usr/lib/systemd/system/*</filename> |
| 77 | +<filename>/run/systemd/generator.late/*</filename> |
72 | 78 | </literallayout></para> |
73 | 79 |
|
74 | | - <para><literallayout><filename>~/.config/systemd/user/*</filename> |
| 80 | + <para><literallayout><filename>~/.config/systemd/user.control/*</filename> |
| 81 | +<filename>$XDG_RUNTIME_DIR/systemd/user.control/*</filename> |
| 82 | +<filename>$XDG_RUNTIME_DIR/systemd/transient/*</filename> |
| 83 | +<filename>$XDG_RUNTIME_DIR/systemd/generator.early/*</filename> |
| 84 | +<filename>~/.config/systemd/user/*</filename> |
75 | 85 | <filename>/etc/systemd/user/*</filename> |
76 | 86 | <filename>$XDG_RUNTIME_DIR/systemd/user/*</filename> |
77 | 87 | <filename>/run/systemd/user/*</filename> |
| 88 | +<filename>$XDG_RUNTIME_DIR/systemd/generator/*</filename> |
78 | 89 | <filename>~/.local/share/systemd/user/*</filename> |
79 | | -<filename>/usr/lib/systemd/user/*</filename> |
80 | 90 | <filename>…</filename> |
| 91 | +<filename>/usr/lib/systemd/user/*</filename> |
| 92 | +<filename>$XDG_RUNTIME_DIR/systemd/generator.late/*</filename> |
81 | 93 | </literallayout></para> |
82 | 94 | </refsynopsisdiv> |
83 | 95 |
|
|
342 | 354 | </row> |
343 | 355 | </thead> |
344 | 356 | <tbody> |
| 357 | + <row> |
| 358 | + <entry><filename>/etc/systemd/system.control</filename></entry> |
| 359 | + <entry morerows="1">Persistent and transient configuration created using the dbus API</entry> |
| 360 | + </row> |
| 361 | + <row> |
| 362 | + <entry><filename>/run/systemd/system.control</filename></entry> |
| 363 | + </row> |
| 364 | + <row> |
| 365 | + <entry><filename>/run/systemd/transient</filename></entry> |
| 366 | + <entry>Dynamic configuration for transient units</entry> |
| 367 | + </row> |
| 368 | + <row> |
| 369 | + <entry><filename>/run/systemd/generator.early</filename></entry> |
| 370 | + <entry>Generated units with high priority (see <replaceable>early-dir</replaceable> in <citerefentry |
| 371 | + ><refentrytitle>system.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>)</entry> |
| 372 | + </row> |
345 | 373 | <row> |
346 | 374 | <entry><filename>/etc/systemd/system</filename></entry> |
347 | 375 | <entry>Local configuration</entry> |
|
350 | 378 | <entry><filename>/run/systemd/system</filename></entry> |
351 | 379 | <entry>Runtime units</entry> |
352 | 380 | </row> |
| 381 | + <row> |
| 382 | + <entry><filename>/run/systemd/generator</filename></entry> |
| 383 | + <entry>Generated units with medium priority (see <replaceable>normal-dir</replaceable> in <citerefentry |
| 384 | + ><refentrytitle>system.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>)</entry> |
| 385 | + </row> |
| 386 | + <row> |
| 387 | + <entry><filename>/usr/local/lib/systemd/system</filename></entry> |
| 388 | + <entry morerows="1">Units of installed packages</entry> |
| 389 | + </row> |
353 | 390 | <row> |
354 | 391 | <entry><filename>/usr/lib/systemd/system</filename></entry> |
355 | | - <entry>Units of installed packages</entry> |
| 392 | + </row> |
| 393 | + <row> |
| 394 | + <entry><filename>/run/systemd/generator.late</filename></entry> |
| 395 | + <entry>Generated units with low priority (see <replaceable>late-dir</replaceable> in <citerefentry |
| 396 | + ><refentrytitle>system.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>)</entry> |
356 | 397 | </row> |
357 | 398 | </tbody> |
358 | 399 | </tgroup> |
|
374 | 415 | </thead> |
375 | 416 | <tbody> |
376 | 417 | <row> |
377 | | - <entry><filename>$XDG_CONFIG_HOME/systemd/user</filename></entry> |
378 | | - <entry>User configuration (only used when $XDG_CONFIG_HOME is set)</entry> |
| 418 | + <entry><filename>$XDG_CONFIG_HOME/systemd/user.control</filename> or <filename |
| 419 | + >~/.config/systemd/user.control</filename></entry> |
| 420 | + <entry morerows="1">Persistent and transient configuration created using the dbus API (<varname>$XDG_CONFIG_HOME</varname> is used if set, <filename>~/.config</filename> otherwise)</entry> |
| 421 | + </row> |
| 422 | + <row> |
| 423 | + <entry><filename>$XDG_RUNTIME_DIR/systemd/user.control</filename></entry> |
| 424 | + </row> |
| 425 | + <row> |
| 426 | + <entry><filename>/run/systemd/transient</filename></entry> |
| 427 | + <entry>Dynamic configuration for transient units</entry> |
| 428 | + </row> |
| 429 | + <row> |
| 430 | + <entry><filename>/run/systemd/generator.early</filename></entry> |
| 431 | + <entry>Generated units with high priority (see <replaceable>early-dir</replaceable> in <citerefentry |
| 432 | + ><refentrytitle>system.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>)</entry> |
379 | 433 | </row> |
380 | 434 | <row> |
381 | | - <entry><filename>$HOME/.config/systemd/user</filename></entry> |
382 | | - <entry>User configuration (only used when $XDG_CONFIG_HOME is not set)</entry> |
| 435 | + <entry><filename>$XDG_CONFIG_HOME/systemd/user</filename> or <filename>$HOME/.config/systemd/user</filename></entry> |
| 436 | + <entry>User configuration (<varname>$XDG_CONFIG_HOME</varname> is used if set, <filename>~/.config</filename> otherwise)</entry> |
383 | 437 | </row> |
384 | 438 | <row> |
385 | 439 | <entry><filename>/etc/systemd/user</filename></entry> |
|
394 | 448 | <entry>Runtime units</entry> |
395 | 449 | </row> |
396 | 450 | <row> |
397 | | - <entry><filename>$XDG_DATA_HOME/systemd/user</filename></entry> |
398 | | - <entry>Units of packages that have been installed in the home directory (only used when $XDG_DATA_HOME is set)</entry> |
| 451 | + <entry><filename>$XDG_RUNTIME_DIR/systemd/generator</filename></entry> |
| 452 | + <entry>Generated units with medium priority (see <replaceable>normal-dir</replaceable> in <citerefentry |
| 453 | + ><refentrytitle>system.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>)</entry> |
399 | 454 | </row> |
400 | 455 | <row> |
401 | | - <entry><filename>$HOME/.local/share/systemd/user</filename></entry> |
402 | | - <entry>Units of packages that have been installed in the home directory (only used when $XDG_DATA_HOME is not set)</entry> |
| 456 | + <entry><filename>$XDG_DATA_HOME/systemd/user</filename> or <filename>$HOME/.local/share/systemd/user</filename></entry> |
| 457 | + <entry>Units of packages that have been installed in the home directory (<varname>$XDG_DATA_HOME</varname> is used if set, <filename>~/.local/share</filename> otherwise)</entry> |
| 458 | + </row> |
| 459 | + <row> |
| 460 | + <entry><filename>$dir/systemd/user</filename> for each <varname noindex='true'>$dir</varname> in <varname>$XDG_DATA_DIRS</varname></entry> |
| 461 | + <entry>Additional locations for installed user units, one for each entry in <varname>$XDG_DATA_DIRS</varname></entry> |
| 462 | + </row> |
| 463 | + <row> |
| 464 | + <entry><filename>/usr/local/lib/systemd/user</filename></entry> |
| 465 | + <entry morerows="1">Units of packages that have been installed system-wide</entry> |
403 | 466 | </row> |
404 | 467 | <row> |
405 | 468 | <entry><filename>/usr/lib/systemd/user</filename></entry> |
406 | | - <entry>Units of packages that have been installed system-wide</entry> |
| 469 | + </row> |
| 470 | + <row> |
| 471 | + <entry><filename>$XDG_RUNTIME_DIR/systemd/generator.late</filename></entry> |
| 472 | + <entry>Generated units with low priority (see <replaceable>late-dir</replaceable> in <citerefentry |
| 473 | + ><refentrytitle>system.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>)</entry> |
407 | 474 | </row> |
408 | 475 | </tbody> |
409 | 476 | </tgroup> |
410 | 477 | </table> |
411 | 478 |
|
412 | | - <para>Additional units might be loaded into systemd ("linked") |
413 | | - from directories not on the unit load path. See the |
414 | | - <command>link</command> command for |
| 479 | + <para>The set of load paths for the user manager instance may be augmented or |
| 480 | + changed using various environment variables. And environment variables may in |
| 481 | + turn be set using environment generators, see |
| 482 | + <citerefentry><refentrytitle>system.environment-generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>. |
| 483 | + In particular, <varname>$XDG_DATA_HOME</varname> and |
| 484 | + <varname>$XDG_DATA_DIRS</varname> may be easily set using |
| 485 | + <citerefentry><refentrytitle>systemd-environment-d-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>. |
| 486 | + Thus, directories listed here are just the defaults. To see the actual list that |
| 487 | + would be used based on compilation options and current environment use |
| 488 | + <programlisting>systemd-analyze --user unit-paths</programlisting> |
| 489 | + </para> |
| 490 | + |
| 491 | + <para>Moreover, additional units might be loaded into systemd ("linked") from |
| 492 | + directories not on the unit load path. See the <command>link</command> command |
| 493 | + for |
415 | 494 | <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>. |
416 | | - Also, some units are dynamically created via a |
417 | | - <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>. |
418 | 495 | </para> |
419 | 496 | </refsect1> |
420 | 497 |
|
|
0 commit comments