mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-19 02:05:42 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Mon, 3 Sep 2018 13:01:58 +0200
|
|
Subject: [PATCH] grub-boot-success.timer: Add a few Conditions for running the
|
|
timer
|
|
|
|
Add 2 Conditions for running the boot-success timer / service:
|
|
|
|
1) Do not run it for system users, this fixes errors about gdm not being
|
|
allowed to use pkexec when the greeter session lasts for more then 2 minutes:
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1592201#c6
|
|
|
|
2) Do not run the timer when pkexec is not available (on minimal installs)
|
|
since then it will just lead to a bunch of errors without doing anything:
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1619445
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
docs/grub-boot-success.timer | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/docs/grub-boot-success.timer b/docs/grub-boot-success.timer
|
|
index 221b532781b..67bd829b795 100644
|
|
--- a/docs/grub-boot-success.timer
|
|
+++ b/docs/grub-boot-success.timer
|
|
@@ -1,5 +1,7 @@
|
|
[Unit]
|
|
Description=Mark boot as successful after the user session has run 2 minutes
|
|
+ConditionUser=!@system
|
|
+ConditionPathExists=/usr/bin/pkexec
|
|
|
|
[Timer]
|
|
OnActiveSec=2min
|