From 1561917c7e7a6d223e9efae1a2b2ea976bb343b2177904cfc438c95be2ba1a48 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Fri, 10 Sep 2021 13:40:39 +0000 Subject: [PATCH] Accepting request 908842 from home:kukuk:tiu - Only run kbdsettings.service if /etc/sysconfig/keyboard exists. Necessary for image based installations without admin made changes. OBS-URL: https://build.opensuse.org/request/show/908842 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=137 --- kbd.changes | 6 ++++++ kbd.spec | 4 ++-- kbdsettings.service | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/kbd.changes b/kbd.changes index c8c8bec..1051d32 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 23 12:03:51 UTC 2021 - Thorsten Kukuk + +- Only run kbdsettings.service if /etc/sysconfig/keyboard exists. + Necessary for image based installations without admin made changes. + ------------------------------------------------------------------- Wed Jun 2 08:08:53 UTC 2021 - Christophe Giboudeaux diff --git a/kbd.spec b/kbd.spec index dc25b9f..dd30904 100644 --- a/kbd.spec +++ b/kbd.spec @@ -1,7 +1,7 @@ # # spec file for package kbd # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -82,7 +82,7 @@ BuildRequires: xz # Temporarily require -legacy Requires: %{name}-legacy = %{version}-%{release} Requires(post): coreutils -Requires(postun): coreutils +Requires(postun):coreutils Requires(pre): %fillup_prereq Provides: vlock = 2.2.3 Obsoletes: vlock <= 2.2.3 diff --git a/kbdsettings.service b/kbdsettings.service index c40d8c0..7c5c947 100644 --- a/kbdsettings.service +++ b/kbdsettings.service @@ -3,6 +3,7 @@ Description=Apply settings from /etc/sysconfig/keyboard After=basic.target After=systemd-vconsole-setup.service PartOf=systemd-vconsole-setup.service +ConditionPathExists=/etc/sysconfig/keyboard ConditionPathExists=/dev/tty0 [Service]