Merge pull request #8184 from poettering/color-ask-pw

Trivial merge conflict resolved locally.

diff --cc .mkosi/mkosi.fedora
Simple merge

diff --cc TODO
index 17022d912bfc99088ab6c39487b26ab2213d8477,0b1b6c84efffa949bcbd71751f00d02d0b3e5bcc..048270bf513e1134df949cc30e6369bc41356ce3
--- 1/TODO
--- 2/TODO
+++ b/TODO
@@@ -24,14 -24,18 +24,26 @@@ Janitorial Clean-ups
  
  Features:
  
 +* block setrlimit(RLIMIT_NOPROC) (and other per-user limits) in nspawn when userns is not on
 +
 +* nss-systemd: implement enumeration, that shows all dynamic users plus the
 +  synthesized ones if necessary, so that "getent passwd" shows useful data.
 +
 +* teach tmpfiles.d q/Q logic something sensible in the context of XFS/ext4
 +  project quota
 +
+ * introduce DefaultSlice= or so in system.conf that allows changing where we
+   place our units by default, i.e. change system.slice to something
+   else. Similar, ManagerSlice= should exist so that PID1's own scope unit could
+   be moved somewhere else too. Finally machined and logind should get similar
+   options so that it is possible to move user session scopes and machines to a
+   different slice too by default. Usecase: people who want to put resources on
+   the entire system, with the exception of one specific service. See:
+   https://lists.freedesktop.org/archives/systemd-devel/2018-February/040369.html
+ 
+ * check what setting the login shell to /bin/false vs. /sbin/nologin means and
+   do the right thing in get_user_creds_clean() with it.
+ 
  * maybe rework get_user_creds() to query the user database if $SHELL is used
    for root, but only then.
  

diff --cc src/basic/process-util.c
Simple merge