Merge master into staging-next

2021-03-23 06:18:02 +00:00
parent bb83a4a08c 4c54b5575e
commit 39e3812215
52 changed files with 300 additions and 740 deletions
@@ -176,8 +176,10 @@ let
      "timers.target.wants"
    ];

-  upstreamUserUnits =
-    [ "basic.target"
+    upstreamUserUnits = [
+      "app.slice"
+      "background.slice"
+      "basic.target"
      "bluetooth.target"
      "default.target"
      "exit.target"
@@ -185,6 +187,7 @@ let
      "graphical-session.target"
      "paths.target"
      "printer.target"
+      "session.slice"
      "shutdown.target"
      "smartcard.target"
      "sockets.target"
@@ -194,6 +197,7 @@ let
      "systemd-tmpfiles-clean.timer"
      "systemd-tmpfiles-setup.service"
      "timers.target"
+      "xdg-desktop-autostart.target"
    ];

  makeJobScript = name: text: