From f7ad96506e29c0cffadb200fe3ddb75ba0111ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 10 Nov 2022 15:12:33 +0100 Subject: [PATCH] mkosi: drop spaces after shell redirection operator --- mkosi.build | 12 ++++++------ mkosi.postinst | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mkosi.build b/mkosi.build index cbf82811cf..dbfd5e3830 100755 --- a/mkosi.build +++ b/mkosi.build @@ -61,7 +61,7 @@ done # version 5.6.0 to satisfy meson which makes bpf work on CentOS Stream 8 as well. if [ "$(grep '^ID=' /etc/os-release)" = "ID=\"centos\"" ] && [ "$(grep '^VERSION=' /etc/os-release)" = "VERSION=\"8\"" ]; then cp /usr/sbin/bpftool /usr/sbin/bpftool.real - cat > /usr/sbin/bpftool </usr/sbin/bpftool <"/tmp/os-release.tmp" - cat /tmp/os-release.tmp > "$DESTDIR"/usr/lib/os-release + cat /tmp/os-release.tmp >"$DESTDIR"/usr/lib/os-release rm /tmp/os-release.tmp fi @@ -238,7 +238,7 @@ if [ -n "$SANITIZERS" ]; then mkdir -p "$DESTDIR/etc/systemd/system.conf.d" - cat > "$DESTDIR/etc/systemd/system.conf.d/10-asan.conf" <"$DESTDIR/etc/systemd/system.conf.d/10-asan.conf" < "$DESTDIR/etc/systemd/system/systemd-journald.service.d/10-stdout-tty.conf" <"$DESTDIR/etc/systemd/system/systemd-journald.service.d/10-stdout-tty.conf" < "$DESTDIR/etc/systemd/system/console-getty.service.d/10-no-vhangup.conf" <"$DESTDIR/etc/systemd/system/console-getty.service.d/10-no-vhangup.conf" < "$DESTDIR/etc/systemd/system-preset/99-mkosi.preset" +echo "disable *" >"$DESTDIR/etc/systemd/system-preset/99-mkosi.preset" if [ -d mkosi.kernel/ ]; then cd "$SRCDIR/mkosi.kernel" diff --git a/mkosi.postinst b/mkosi.postinst index fb59d31115..cebbf29250 100755 --- a/mkosi.postinst +++ b/mkosi.postinst @@ -2,11 +2,11 @@ # SPDX-License-Identifier: LGPL-2.1-or-later if [ "$1" = "final" ]; then - if command -v bootctl > /dev/null && [ -d "/efi" ]; then + if command -v bootctl >/dev/null && [ -d "/efi" ]; then bootctl install fi - cat >> /root/.gdbinit <>/root/.gdbinit <