diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-11-25 13:20:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-25 13:20:42 +0100 |
| commit | ef58c14587147d54abfd27ef7122fbfeb93098bb (patch) | |
| tree | 727a1462cf4486639acf23c9abbf83d19fee6496 | |
| parent | e2c5e698c094165919af8d5f91896425c918c850 (diff) | |
| parent | cb42e63179a0baae95a928a922d216c2d3cf6822 (diff) | |
| download | systemd-ef58c14587147d54abfd27ef7122fbfeb93098bb.tar.gz | |
Merge pull request #17721 from poettering/more-strjoin-cryptsetup
two minor fixes/clean-ups
| -rw-r--r-- | src/cryptsetup/cryptsetup.c | 3 | ||||
| -rw-r--r-- | units/systemd-journald.service.in | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index 6ccb152d10..f0761ac8aa 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -353,7 +353,8 @@ static char *disk_mount_point(const char *label) { /* Yeah, we don't support native systemd unit files here for now */ - if (asprintf(&device, "/dev/mapper/%s", label) < 0) + device = strjoin("/dev/mapper/", label); + if (!device) return NULL; f = setmntent(fstab_path(), "re"); diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in index eb4bd938d7..c743254137 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -42,8 +42,8 @@ Type=notify @SERVICE_WATCHDOG@ # In case you're wondering why CAP_SYS_PTRACE is needed, access to -# /proc/<pid>/exec requires this capability. Thus if this cap is missing -# _EXE/OBJECT_EXE fields will be missing from the journal entries. +# /proc/<pid>/exe requires this capability. Thus if this capability is missing +# the _EXE=/OBJECT_EXE= fields will be missing from the journal entries. CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_CHOWN CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SETUID CAP_SETGID CAP_MAC_OVERRIDE # If there are many split up journal files we need a lot of fds to access them |