picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17721 from poettering/more-strjoin-cryptsetup 

two minor fixes/clean-ups
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-11-25 13:20:42 +01:00 committed by GitHub
parent e2c5e698c0 cb42e63179
commit ef58c14587
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cryptsetup/cryptsetup.c
View File

@ -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");

4
units/systemd-journald.service.in
View File

@ -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