From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 20 Nov 2017 12:06:33 +0000 (+0100)
Subject: Merge pull request #7154 from keszybz/bootspec
X-Git-Tag: v236~174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ff183d419f9ec271ae311dae0bc01b4bb204b50;p=thirdparty%2Fsystemd.git

Merge pull request #7154 from keszybz/bootspec

List bootspec entries in bootctl and use the default for kexec
---

4ff183d419f9ec271ae311dae0bc01b4bb204b50
diff --cc test/test-functions
index 65bdd44f095,96118ae3ad9..bfbd308c294
--- a/test/test-functions
+++ b/test/test-functions
@@@ -12,8 -12,9 +12,9 @@@ KERNEL_MODS="/lib/modules/$KERNEL_VER/
  QEMU_TIMEOUT="${QEMU_TIMEOUT:-infinity}"
  NSPAWN_TIMEOUT="${NSPAWN_TIMEOUT:-infinity}"
  TIMED_OUT=  # will be 1 after run_* if *_TIMEOUT is set and test timed out
 -[[ "$LOOKS_LIKE_SUSE" ]] && FSTYPE="${FSTYPE:-btrfs}" || FSTYPE="${FSTYPE:-ext3}"
 +[[ "$LOOKS_LIKE_SUSE" ]] && FSTYPE="${FSTYPE:-btrfs}" || FSTYPE="${FSTYPE:-ext4}"
  UNIFIED_CGROUP_HIERARCHY="${UNIFIED_CGROUP_HIERARCHY:-default}"
+ EFI_MOUNT="$(bootctl -p)"
  
  if ! ROOTLIBDIR=$(pkg-config --variable=systemdutildir systemd); then
      echo "WARNING! Cannot determine rootlibdir from pkg-config, assuming /usr/lib/systemd" >&2