Merge pull request #21838 from lnussel/logind-refactor

Logind shutdown refactor
2022-01-31 19:45:33 +09:00
parent e3759ac43a 48f3bc5cc4
commit 256ce2e889
16 changed files with 536 additions and 361 deletions
@@ -1896,6 +1896,8 @@ has_user_dbus_socket() {
    fi
 }

+setup_nspawn_root_hook() { :;}
+
 setup_nspawn_root() {
    if [ -z "${initdir}" ]; then
        dfatal "\$initdir not defined"
@@ -1908,6 +1910,8 @@ setup_nspawn_root() {
        ddebug "cp -ar $initdir $TESTDIR/unprivileged-nspawn-root"
        cp -ar "$initdir" "$TESTDIR/unprivileged-nspawn-root"
    fi
+
+    setup_nspawn_root_hook
 }

 setup_basic_dirs() {