core/main: respect skip_setup for RUNTIME_SCOPE_USER too

This commit is contained in:
Mike Yuan
2024-07-13 22:58:24 +02:00
parent 0acf4dfef5
commit 9100325690
+9 -5
View File
@@ -2435,11 +2435,15 @@ static int initialize_runtime(
"MESSAGE_ID=" SD_MESSAGE_CORE_NO_XDGDIR_PATH_STR);
}
(void) mkdir_p_label(p, 0755);
(void) make_inaccessible_nodes(p, UID_INVALID, GID_INVALID);
r = setup_os_release(RUNTIME_SCOPE_USER);
if (r < 0)
log_warning_errno(r, "Failed to copy os-release for propagation, ignoring: %m");
if (!skip_setup) {
(void) mkdir_p_label(p, 0755);
(void) make_inaccessible_nodes(p, UID_INVALID, GID_INVALID);
r = setup_os_release(RUNTIME_SCOPE_USER);
if (r < 0)
log_warning_errno(r, "Failed to copy os-release for propagation, ignoring: %m");
}
break;
}