mirror of
https://github.com/systemd/systemd
synced 2025-09-24 22:34:45 +02:00
Compare commits
3 Commits
5bf7438ff0
...
a0203ac14c
Author | SHA1 | Date | |
---|---|---|---|
![]() |
a0203ac14c | ||
![]() |
e3f4aa4a75 | ||
![]() |
6c32948b25 |
@ -46,7 +46,8 @@ _journalctl() {
|
|||||||
--version --list-catalog --update-catalog --list-boots
|
--version --list-catalog --update-catalog --list-boots
|
||||||
--show-cursor --dmesg -k --pager-end -e -r --reverse
|
--show-cursor --dmesg -k --pager-end -e -r --reverse
|
||||||
--utc -x --catalog --no-full --force --dump-catalog
|
--utc -x --catalog --no-full --force --dump-catalog
|
||||||
--flush --rotate --sync --no-hostname -N --fields
|
--flush --rotate --sync --relinquish-var
|
||||||
|
--smart-relinquish-var --no-hostname -N --fields
|
||||||
--list-namespaces --list-invocations -I -v --verbose'
|
--list-namespaces --list-invocations -I -v --verbose'
|
||||||
[ARG]='-b --boot -D --directory -i --file -F --field -t --identifier
|
[ARG]='-b --boot -D --directory -i --file -F --field -t --identifier
|
||||||
-T --exclude-identifier --facility -M --machine -o --output
|
-T --exclude-identifier --facility -M --machine -o --output
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <sys/file.h>
|
#include <sys/file.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "sd-device.h"
|
#include "sd-device.h"
|
||||||
|
|
||||||
|
@ -1454,20 +1454,21 @@ testcase_link_journal_host() {
|
|||||||
|
|
||||||
systemd-id128 new > "$root"/etc/machine-id
|
systemd-id128 new > "$root"/etc/machine-id
|
||||||
|
|
||||||
mkdir -p /var/log/journal
|
hoge="/var/log/journal/$(cat "$root"/etc/machine-id)/"
|
||||||
|
mkdir -p "$hoge"
|
||||||
hoge="/var/log/journal/$(cat "$root"/etc/machine-id)/hoge"
|
# The systemd-journal group is not mapped, so ensure the directory is owned by root:root
|
||||||
|
chown root:root "$hoge"
|
||||||
|
|
||||||
for i in no yes pick; do
|
for i in no yes pick; do
|
||||||
systemd-nspawn \
|
systemd-nspawn \
|
||||||
--directory="$root" --private-users="$i" --link-journal=host \
|
--directory="$root" --private-users="$i" --link-journal=host \
|
||||||
bash -xec 'p="/var/log/journal/$(cat /etc/machine-id)"; mountpoint "$p"; [[ "$(stat "$p" --format=%u)" == 0 ]]; touch "$p/hoge"'
|
bash -xec 'p="/var/log/journal/$(cat /etc/machine-id)"; mountpoint "$p"; [[ "$(stat "$p" --format=%u)" == 0 ]]; touch "$p/hoge"'
|
||||||
|
|
||||||
[[ "$(stat "$hoge" --format=%u)" == 0 ]]
|
[[ "$(stat "${hoge}/hoge" --format=%u)" == 0 ]]
|
||||||
rm "$hoge"
|
rm "${hoge}/hoge"
|
||||||
done
|
done
|
||||||
|
|
||||||
rm -fr "$root"
|
rm -fr "$root" "$hoge"
|
||||||
}
|
}
|
||||||
|
|
||||||
testcase_cap_net_bind_service() {
|
testcase_cap_net_bind_service() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user