Merge pull request #7154 from keszybz/bootspec

List bootspec entries in bootctl and use the default for kexec

diff --cc man/bootctl.xml
Simple merge

diff --cc man/systemctl.xml
Simple merge

diff --cc src/boot/bootctl.c
Simple merge

diff --cc src/boot/efi/boot.c
Simple merge

diff --cc src/shared/meson.build
Simple merge

diff --cc src/systemctl/systemctl.c
Simple merge

diff --cc test/test-functions
index 65bdd44f0953a2b320c67a28433bf9a78f0f41d9,96118ae3ad93415fe86e6231e92c6157ab929317..bfbd308c294a433befd712989278abc9d2eaa621
--- 1/test/test-functions
--- 2/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