Add 2 conditions to boot-success timer and service

- Don't run it for system users
  Resolves: rhbz#1592201
- Don't run it when pkexec isn't available
  Resolves: rhbz#1619445

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-09-12 10:37:46 -04:00
parent 98536ecf37
commit b796a9a04b
3 changed files with 42 additions and 1 deletions

View file

@ -0,0 +1,33 @@
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

View file

@ -237,3 +237,4 @@ Patch0236: 0236-Add-a-version-command.patch
Patch0237: 0237-Add-more-dprintf-and-nerf-dprintf-in-script.c.patch
Patch0238: 0238-arm-arm64-loader-Better-memory-allocation-and-error-.patch
Patch0239: 0239-Try-to-pick-better-locations-for-kernel-and-initrd.patch
Patch0240: 0240-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch

View file

@ -7,7 +7,7 @@
Name: grub2
Epoch: 1
Version: 2.02
Release: 57%{?dist}
Release: 58%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
License: GPLv3+
@ -498,6 +498,13 @@ fi
%endif
%changelog
* Wed Sep 12 2018 Peter Jones <pjones@redhat.com> - 2.02-58
- Add 2 conditions to boot-success timer and service:
- Don't run it for system users
Resolves: rhbz#1592201
- Don't run it when pkexec isn't available
Resolves: rhbz#1619445
* Tue Sep 11 2018 Peter Jones <pjones@redhat.com> - 2.02-57
- Limit grub_malloc() on x86_64 to < 31bit addresses, as some devices seem to
have a colossally broken storage controller (or UEFI driver) that can't do