X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=mkosi.build;h=16ac2e9d0d6952949b1be240962d94167666df77;hb=5e467d74ad0c87f1f5e1a1e58bdce7b1971dd7a3;hp=093a586b8362bc759349d1cfffba2208b685ad7b;hpb=4d09e1c8bab1d684172b1f277f3213825b30d2d9;p=thirdparty%2Fsystemd.git

diff --git a/mkosi.build b/mkosi.build
index 093a586b836..16ac2e9d0d6 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -1,10 +1,6 @@
 #!/bin/sh
 set -ex
 
-# This file is part of systemd.
-#
-# Copyright 2016 Lennart Poettering
-
 # This is a build script for OS image generation using mkosi (https://github.com/systemd/mkosi).
 # Simply invoke "mkosi" in the project directory to build an OS image.
 
@@ -84,7 +80,7 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then
 fi
 
 ninja -C "$BUILDDIR" all
-[ "$WITH_TESTS" = 0 ] || ninja -C "$BUILDDIR" test || ( RET="$?" ; cat "$BUILDDIR"/meson-logs/testlog.txt ; exit "$RET" )
+[ "$WITH_TESTS" = 0 ] || ninja -C "$BUILDDIR" test
 ninja -C "$BUILDDIR" install
 
 mkdir -p "$DESTDIR"/etc
@@ -94,3 +90,12 @@ cat > "$DESTDIR"/etc/issue <<EOF
 Kernel \r on an \m (\l)
 
 EOF
+
+# Manually update the boot loader from the one we just built
+mkdir -p "$DESTDIR"/boot/efi/EFI/systemd "$DESTDIR"/boot/efi/EFI/BOOT
+cp "$DESTDIR"/usr/lib/systemd/boot/efi/systemd-bootx64.efi "$DESTDIR"/boot/efi/EFI/systemd/systemd-bootx64.efi
+cp "$DESTDIR"/usr/lib/systemd/boot/efi/systemd-bootx64.efi "$DESTDIR"/boot/efi/EFI/BOOT/bootx64.efi
+
+mkdir -p "$DESTDIR"/efi/EFI/systemd "$DESTDIR"/efi/EFI/BOOT
+cp "$DESTDIR"/usr/lib/systemd/boot/efi/systemd-bootx64.efi "$DESTDIR"/efi/EFI/systemd/systemd-bootx64.efi
+cp "$DESTDIR"/usr/lib/systemd/boot/efi/systemd-bootx64.efi "$DESTDIR"/efi/EFI/BOOT/bootx64.efi