SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #29650 from YHNdnzj/more-followup

Browse Source 
Some more follow-ups for recent PRs
This commit is contained in:
Luca Boccassi
2023-10-21 11:37:38 +01:00
committed by GitHub
parent 7a876307bb 0f095d0b8f
commit 04144b9169
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/ENVIRONMENT.md
+1 -1
View File
@@ -141,7 +141,7 @@ All tools:
* `$SYSTEMCTL_SKIP_AUTO_SOFT_REBOOT=1` — if set, do not automatically soft-reboot
instead of reboot when a new root file system has been loaded in
`/run/nextroot`.
`/run/nextroot/`.
`systemd-nspawn`:
man/systemctl.xml
+2 -2
View File
@@ -1655,7 +1655,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
<para>If a new kernel has been loaded via <command>kexec --load</command>, a
<command>kexec</command> will be performed instead of a reboot, unless
<literal>SYSTEMCTL_SKIP_AUTO_KEXEC=1</literal> has been set. If a new root file system has
been setup on <literal>/run/nextroot</literal>, a <command>soft-reboot</command> will be
been set up on <literal>/run/nextroot/</literal>, a <command>soft-reboot</command> will be
performed instead of a reboot, unless <literal>SYSTEMCTL_SKIP_AUTO_SOFT_REBOOT=1</literal> has
been set.</para>
@@ -1711,7 +1711,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
<citerefentry><refentrytitle>systemd-soft-reboot.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
for details.</para>
<para>If a new root file system has been setup on <literal>/run/nextroot</literal>, a
<para>If a new root file system has been set up on <literal>/run/nextroot/</literal>, a
<command>soft-reboot</command> will be performed when <command>reboot</command> is invoked,
unless <literal>SYSTEMCTL_SKIP_AUTO_SOFT_REBOOT=1</literal> has been set.</para>
man/systemd-soft-reboot.service.xml
+1 -1
View File
@@ -165,7 +165,7 @@ ExecStart=sleep infinity
executed directly. Instead, trigger system shutdown with a command such as <literal>systemctl
soft-reboot</literal>.</para>
<para>Note that if a new root file system has been setup on <literal>/run/nextroot</literal>, a
<para>Note that if a new root file system has been set up on <literal>/run/nextroot/</literal>, a
<command>soft-reboot</command> will be performed when the <command>reboot</command> command is
invoked.</para>
</refsect1>
src/core/execute.c
+3 -5
View File
@@ -555,8 +555,8 @@ void exec_context_done(ExecContext *c) {
c->syscall_archs = set_free(c->syscall_archs);
c->address_families = set_free(c->address_families);
for (ExecDirectoryType t = 0; t < _EXEC_DIRECTORY_TYPE_MAX; t++)
exec_directory_done(&c->directories[t]);
FOREACH_ARRAY(d, c->directories, _EXEC_DIRECTORY_TYPE_MAX)
exec_directory_done(d);
c->log_level_max = -1;
@@ -2487,9 +2487,7 @@ void exec_params_serialized_done(ExecParameters *p) {
p->cgroup_path = mfree(p->cgroup_path);
if (p->prefix) {
for (ExecDirectoryType t = 0; t < _EXEC_DIRECTORY_TYPE_MAX; t++)
free(p->prefix[t]);
free_many_charp(p->prefix, _EXEC_DIRECTORY_TYPE_MAX);
p->prefix = mfree(p->prefix);
}
src/shared/mount-util.c
+3 -2
View File
@@ -1107,8 +1107,9 @@ static int mount_in_namespace(
if (r > 0)
return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "Failed to activate bind mount in target, not running in a mount namespace");
if (pidref_verify(target) < 0)
return log_debug_errno(SYNTHETIC_ERRNO(ESRCH), "Failed to verify target process '" PID_FMT "': %m", target->pid);
r = pidref_verify(target);
if (r < 0)
return log_debug_errno(r, "Failed to verify target process '" PID_FMT "': %m", target->pid);
r = chase(src, NULL, 0, &chased_src_path, &chased_src_fd);
if (r < 0)