]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #16603 from benzea/benzea/special-app-slice
authorLennart Poettering <lennart@poettering.net>
Wed, 11 Nov 2020 13:11:02 +0000 (14:11 +0100)
committerGitHub <noreply@github.com>
Wed, 11 Nov 2020 13:11:02 +0000 (14:11 +0100)
Use app.slice by default in user manager (and define special user slices)

1  2 
man/systemd.special.xml
src/basic/special.h
src/core/mount.c
src/core/swap.c
src/core/unit.c
src/core/unit.h
units/user/meson.build
units/user/systemd-exit.service
units/user/systemd-tmpfiles-clean.service

Simple merge
Simple merge
Simple merge
diff --cc src/core/swap.c
Simple merge
diff --cc src/core/unit.c
Simple merge
diff --cc src/core/unit.h
Simple merge
index b2a599b6d8aa76cea4b6775d360c99850bda0446,744c1e7c5e9d6eff550d738b74322328475f7d52..337a92092dbed68be398822feeef0abb31cc2594
@@@ -1,6 -1,8 +1,8 @@@
 -# SPDX-License-Identifier: LGPL-2.1+
 +# SPDX-License-Identifier: LGPL-2.1-or-later
  
  units = [
+         'app.slice',
+         'background.slice',
          'basic.target',
          'bluetooth.target',
          'default.target',
Simple merge