mirror of
https://github.com/systemd/systemd.git
synced 2026-08-13 17:08:14 +00:00
TEST-07-PID1: Don't fail in vm without ESP or XBOOTLDR mount
(cherry picked from commit e7d1030d77)
This commit is contained in:
committed by
Luca Boccassi
parent
2aa3e50692
commit
0ecb372eac
@@ -33,12 +33,14 @@ proc_supports_option() {
|
||||
# in that case instead of complicating the test setup even more */
|
||||
if [[ -z "${COVERAGE_BUILD_DIR:-}" ]]; then
|
||||
if ! systemd-detect-virt -cq && command -v bootctl >/dev/null; then
|
||||
boot_path="$(bootctl --print-boot-path)"
|
||||
esp_path="$(bootctl --print-esp-path)"
|
||||
boot_path="$(bootctl --print-boot-path)" || :
|
||||
esp_path="$(bootctl --print-esp-path)" || :
|
||||
|
||||
# If the mount points are handled by automount units, make sure we trigger
|
||||
# them before proceeding further
|
||||
ls -l "$boot_path" "$esp_path"
|
||||
if [[ -n "${boot_path:-}" && -n "${esp_path:-}" ]]; then
|
||||
ls -l "$boot_path" "$esp_path"
|
||||
fi
|
||||
fi
|
||||
|
||||
systemd-run --wait --pipe -p ProtectSystem=yes \
|
||||
|
||||
Reference in New Issue
Block a user