From b679c30cabe0a2cfef7dfcff1408cbc5681af71014a31967945249da971a65f6 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Fri, 23 Apr 2021 03:44:52 +0000 Subject: [PATCH] Accepting request 887910 from home:michael-chang:branches:Base:System - Fix obsolete syslog in systemd unit file and updating to use journal as StandardOutput (bsc#1185149) * grub2-once.service OBS-URL: https://build.opensuse.org/request/show/887910 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=382 --- grub2-once.service | 2 +- grub2.changes | 7 +++++++ grub2.spec | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/grub2-once.service b/grub2-once.service index 80e6211..c5dc48b 100644 --- a/grub2-once.service +++ b/grub2-once.service @@ -10,7 +10,7 @@ ConditionPathIsReadWrite=/boot/grub2/grubenv Type=oneshot ExecStart=-/usr/bin/grub2-editenv /boot/grub2/grubenv unset next_entry ExecStartPost=-/usr/bin/systemctl disable grub2-once.service -StandardOutput=syslog +StandardOutput=journal [Install] WantedBy=sysinit.target diff --git a/grub2.changes b/grub2.changes index 2b78e14..4bf28a0 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 23 03:27:37 UTC 2021 - Michael Chang + +- Fix obsolete syslog in systemd unit file and updating to use journal as + StandardOutput (bsc#1185149) + * grub2-once.service + ------------------------------------------------------------------- Mon Apr 19 09:53:43 UTC 2021 - Michael Chang diff --git a/grub2.spec b/grub2.spec index 9cbb849..8dad321 100644 --- a/grub2.spec +++ b/grub2.spec @@ -253,7 +253,7 @@ Patch164: grub2-suse-remove-linux-root-param.patch # PPC64 LE support Patch205: grub2-ppc64le-disable-video.patch Patch207: grub2-ppc64le-memory-map.patch -# PPC +# PPC Patch211: grub2-ppc64-cas-reboot-support.patch Patch212: grub2-install-remove-useless-check-PReP-partition-is-empty.patch Patch213: grub2-Fix-incorrect-netmask-on-ppc64.patch @@ -277,7 +277,7 @@ Patch411: 0012-tpm-Build-tpm-as-module.patch # UEFI HTTP and related network protocol support (FATE#320130) Patch420: 0001-add-support-for-UEFI-network-protocols.patch Patch421: 0002-AUDIT-0-http-boot-tracker-bug.patch -# check if default entry need to be corrected for updated distributor version +# check if default entry need to be corrected for updated distributor version # and/or use fallback entry if default kernel entry removed (bsc#1065349) Patch430: grub2-mkconfig-default-entry-correction.patch Patch431: grub2-s390x-10-keep-network-at-kexec.patch @@ -464,7 +464,7 @@ Group: System/Boot BuildArch: noarch %endif Requires: %{name} = %{version} -Requires(post): %{name} = %{version} +Requires(post): %{name} = %{version} %if 0%{?update_bootloader_requires:1} %update_bootloader_requires %else @@ -506,7 +506,7 @@ BuildArch: noarch Requires: efibootmgr Requires(post): efibootmgr Requires: %{name} = %{version} -Requires(post): %{name} = %{version} +Requires(post): %{name} = %{version} %if 0%{?update_bootloader_requires:1} %update_bootloader_requires %else @@ -880,9 +880,9 @@ PXE_MODULES="efinet tftp http" CRYPTO_MODULES="luks gcry_rijndael gcry_sha1 gcry_sha256" %ifarch x86_64 -CD_MODULES="${CD_MODULES} linuxefi" +CD_MODULES="${CD_MODULES} linuxefi" %else -CD_MODULES="${CD_MODULES} linux" +CD_MODULES="${CD_MODULES} linux" %endif # SBAT metadata @@ -941,7 +941,7 @@ cd build # 64-bit x86-64 machines use 32-bit boot loader # (We cannot just redefine _target_cpu, as we'd get i386.rpm packages then) -%ifarch x86_64 +%ifarch x86_64 %define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu} %endif @@ -992,7 +992,7 @@ install -m 644 grub-tpm.efi %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/. # Create grub.efi link to system efi directory # This is for tools like kiwi not fiddling with the path %define sysefibasedir %{_datadir}/efi -%define sysefidir %{sysefibasedir}/%{_target_cpu} +%define sysefidir %{sysefibasedir}/%{_target_cpu} install -d %{buildroot}/%{sysefidir} ln -sr %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{buildroot}%{sysefidir}/grub.efi %ifarch x86_64 @@ -1133,7 +1133,7 @@ perl -ni -e ' %if ! 0%{?only_efi:1} %post %{grubarch} -%if 0%{?update_bootloader_check_type_reinit_post:1} +%if 0%{?update_bootloader_check_type_reinit_post:1} %update_bootloader_check_type_reinit_post grub2 %else # To check by current loader settings @@ -1187,7 +1187,7 @@ fi %ifarch %{efi} %post %{grubefiarch} -%if 0%{?update_bootloader_check_type_reinit_post:1} +%if 0%{?update_bootloader_check_type_reinit_post:1} %update_bootloader_check_type_reinit_post grub2-efi %else # To check by current loader settings