From 637820eccd796027569097ce4fc4657c3b207f79db5c87e15294a6349cf73e51 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 15 Jun 2022 12:35:14 +0000 Subject: [PATCH] Accepting request 982793 from home:lnussel:branches:Base:System - spec: add sbat (boo#1198589) OBS-URL: https://build.opensuse.org/request/show/982793 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1288 --- systemd.changes | 5 +++++ systemd.spec | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/systemd.changes b/systemd.changes index c53dd854..7ca5fb87 100644 --- a/systemd.changes +++ b/systemd.changes @@ -55,6 +55,11 @@ Fri Apr 29 12:37:00 UTC 2022 - Franck Bui It's a backport of upstream commit 1000522a60ceade446773c67031b47a566d4a70d. +------------------------------------------------------------------- +Wed Apr 20 08:25:27 UTC 2022 - Ludwig Nussel + +- spec: add sbat (boo#1198589) + ------------------------------------------------------------------- Wed Apr 20 07:59:23 UTC 2022 - Ludwig Nussel diff --git a/systemd.spec b/systemd.spec index 458649e6..12703af0 100644 --- a/systemd.spec +++ b/systemd.spec @@ -704,7 +704,13 @@ Have fun with these services at your own risk. \ -Dgnu-efi=%{when sd_boot} \ -Dkernel-install=%{when sd_boot} \ - -Dsbat-distro= \ + \ + -Dsbat-distro="%{?sbat_distro}" \ + -Dsbat-distro-summary="%{?sbat_distro_summary}" \ + -Dsbat-distro-url="%{?sbat_distro_url}" \ + \ + -Dsbat-distro-pkgname="%{name}" \ + -Dsbat-distro-version="%{version}-%{release}" \ \ -Ddefault-dnssec=no \ -Ddns-servers='' \ @@ -1001,8 +1007,8 @@ systemctl daemon-reexec || : # systemctl kill --kill-who=main --signal=SIGRTMIN+25 "user@*.service" || : if [ "$1" -eq 1 ]; then - # Persistent journal is the default - mkdir -p %{_localstatedir}/log/journal + # Persistent journal is the default + mkdir -p %{_localstatedir}/log/journal fi %journal_catalog_update @@ -1081,7 +1087,7 @@ fi # old systems, the file doesn't exist. This is equivalent to # generation #1, which enables the creation of all compat symlinks. if [ $1 -eq 1 ]; then - echo "COMPAT_SYMLINK_GENERATION=2" >/usr/lib/udev/compat-symlink-generation + echo "COMPAT_SYMLINK_GENERATION=2" >/usr/lib/udev/compat-symlink-generation fi %post -n udev%{?mini}