Compare commits

..

No commits in common. "1d086a6e59729635396204fc05234f1d3caa0847" and "ab1b472062cdd18f63d0cd1af9e25cbb331a5ef5" have entirely different histories.

4 changed files with 10 additions and 12 deletions

View File

@ -19,7 +19,7 @@ interfaces are currently used by dracut and the ArchLinux initrds.
* The initrd should mount `/run/` as a tmpfs and pass it pre-mounted when * The initrd should mount `/run/` as a tmpfs and pass it pre-mounted when
jumping into the main system when executing systemd. The mount options should jumping into the main system when executing systemd. The mount options should
be `mode=755,nodev,nosuid,strictatime`. be `mode=755,nodev,nosuid,strictatime`
* It's highly recommended that the initrd also mounts `/usr/` (if split off) as * It's highly recommended that the initrd also mounts `/usr/` (if split off) as
appropriate and passes it pre-mounted to the main system, to avoid the appropriate and passes it pre-mounted to the main system, to avoid the

View File

@ -155,8 +155,6 @@ without communicating with the `systemd` process:
Many other programs support operation without the system manager except when Many other programs support operation without the system manager except when
the specific functionality requires such communication. For example the specific functionality requires such communication. For example
`journalctl` operates almost independently, but will query the boot id when `journalctl` operates almost independently, but will query the boot id when
`--boot` option is used; it also requires `systemd-journald` (and thus `--boot` option is used. `systemd-journal-remote`, `systemd-journal-upload`,
`systemd`) to be running for options like `--flush` and `--sync`. `systemd-journal-gatewayd`, `coredumpctl`, `busctl`, `systemctl --root` also
`systemd-journal-remote`, `systemd-journal-upload`, `systemd-journal-gatewayd`, fall into this category.
`coredumpctl`, `busctl`, `systemctl --root` also fall into this category of
mostly-independent programs.

View File

@ -90,9 +90,9 @@ kernel threads are excluded too. Thus, a daemon which wants to take advantage
of this logic needs to place the following at the top of its main() function: of this logic needs to place the following at the top of its main() function:
```c ```c
...
[0][0] = '@'; [0][0] = '@';
...
``` ```
And that's already it. Note that this functionality is only to be used by And that's already it. Note that this functionality is only to be used by
@ -116,10 +116,10 @@ otherwise doesn't. Something like this:
#include <unistd.h> #include <unistd.h>
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
...
if (access("/etc/initrd-release", F_OK) >= 0) if (access("/etc/initrd-release", F_OK) >= 0)
argv[0][0] = '@'; argv[0][0] = '@';
...
} }
``` ```
@ -190,4 +190,4 @@ few additional notes for supporting these setups:
program consult this blog story: [Socket program consult this blog story: [Socket
Activation](http://0pointer.de/blog/projects/socket-activation.html) Activation](http://0pointer.de/blog/projects/socket-activation.html)
* Consider having a look at the [initrd Interface of systemd](https://systemd.io/INITRD_INTERFACE/). * Consider having a look at the [initrd Interface of systemd](http://www.freedesktop.org/wiki/Software/systemd/InitrdInterface)

View File

@ -1568,7 +1568,7 @@ static int mount_setup_existing_unit(
if (r > 0) if (r > 0)
flags |= MOUNT_PROC_JUST_CHANGED; flags |= MOUNT_PROC_JUST_CHANGED;
if (!MOUNT(u)->from_proc_self_mountinfo || FLAGS_SET(MOUNT(u)->proc_flags, MOUNT_PROC_JUST_MOUNTED) || MOUNT(u)->state == MOUNT_MOUNTING) if (!MOUNT(u)->from_proc_self_mountinfo || FLAGS_SET(MOUNT(u)->proc_flags, MOUNT_PROC_JUST_MOUNTED))
flags |= MOUNT_PROC_JUST_MOUNTED; flags |= MOUNT_PROC_JUST_MOUNTED;
MOUNT(u)->from_proc_self_mountinfo = true; MOUNT(u)->from_proc_self_mountinfo = true;