morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

pid1: issue boot context issue at boot

Browse Source
This commit is contained in:
Lennart Poettering
2024-11-18 11:46:42 +01:00
parent 91aa93ec8d
commit 98c283131c
1 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/core/main.c
View File

@@ -45,6 +45,7 @@
#include "efivars.h"
#include "emergency-action.h"
#include "env-util.h"
#include "escape.h"
#include "exit-status.h"
#include "fd-util.h"
#include "fdset.h"
@@ -57,6 +58,7 @@
#include "ima-setup.h"
#include "import-creds.h"
#include "initrd-util.h"
#include "io-util.h"
#include "ipe-setup.h"
#include "killall.h"
#include "kmod-setup.h"
@@ -73,6 +75,7 @@
#include "mount-setup.h"
#include "mount-util.h"
#include "os-util.h"
#include "osc-context.h"
#include "pager.h"
#include "parse-argument.h"
#include "parse-util.h"
@@ -2382,6 +2385,38 @@ static void log_execution_mode(bool *ret_first_boot) {
*ret_first_boot = first_boot;
}
static int write_boot_or_shutdown_osc(const char *type) {
int r;
assert(STRPTR_IN_SET(type, "boot", "shutdown"));
if (getenv_terminal_is_dumb())
return 0;
_cleanup_close_ int fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
if (fd < 0)
return log_debug_errno(fd, "Failed to open /dev/console to print %s OSC, ignoring: %m", type);
_cleanup_free_ char *seq = NULL;
if (streq(type, "boot"))
r = osc_context_open_boot(&seq);
else
r = osc_context_close(SD_ID128_ALLF, &seq);
if (r < 0)
return log_debug_errno(r, "Failed to acquire %s OSC sequence, ignoring: %m", type);
r = loop_write(fd, seq, SIZE_MAX);
if (r < 0)
return log_debug_errno(r, "Failed to write %s OSC sequence, ignoring: %m", type);
if (DEBUG_LOGGING) {
_cleanup_free_ char *h = cescape(seq);
log_debug("OSC sequence for %s successfully written: %s", type, strna(h));
}
return 0;
}
static int initialize_runtime(
bool skip_setup,
bool first_boot,
@@ -2440,6 +2475,8 @@ static int initialize_runtime(
write_container_id();
(void) write_boot_or_shutdown_osc("boot");
/* Copy os-release to the propagate directory, so that we update it for services running
* under RootDirectory=/RootImage= when we do a soft reboot. */
r = setup_os_release(RUNTIME_SCOPE_SYSTEM);
@@ -3422,6 +3459,8 @@ finish:
}
#endif
(void) write_boot_or_shutdown_osc("shutdown");
if (r < 0)
(void) sd_notifyf(/* unset_environment= */ false,
"ERRNO=%i", -r);