Attachment 1452559 Details for Bug 1592221 – [PATCH 2/2] selinux-autorelabel: Increment boot_indeterminate grub environment variable

[patch] [PATCH 2/2] selinux-autorelabel: Increment boot_indeterminate grub environment variable

0002-selinux-autorelabel-Increment-boot_indeterminate-gru.patch (text/plain), 1.95 KB, created by Hans de Goede on 2018-06-18 08:39:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans de Goede

Created: 2018-06-18 08:39:22 UTC

Size: 1.95 KB

patch

obsolete

>From 6eb31466e55151b3d98502e5e2ac58521cd685ed Mon Sep 17 00:00:00 2001
>From: Hans de Goede <hdegoede@redhat.com>
>Date: Mon, 18 Jun 2018 09:37:59 +0200
>Subject: [PATCH 2/2] selinux-autorelabel: Increment boot_indeterminate grub
> environment variable
>
>For the new grub auto-hide feature:
>https://fedoraproject.org/wiki/Changes/HiddenGrubMenu
>
>Grub needs to know if the previous boot succeeded. This is tracked
>through flags in the grub environment.
>
>A selinux autorelabel is special, because it reboots the machine without
>completing the boot in the normal manner.
>
>grub checks the (new) boot_indeterminate grub environment variable to deal
>with this. This is a variable containing a count of special boots since
>the last successful normal boot. If this variable is 1 then it also treats
>the previous boot as successful. The idea is that an autorelabel (or
>offline updates) increments boot_indeterminate, so normally after a reboot
>it will be 1 and the grub menu stays hidden. But if we end up in a selinux
>autorelabel loop for some reason, then it will be bigger then 1 (*) and
>the grub menu will be shown allowing the user to try and fix things.
>
>*) grub itself will also increment it if it is 1 so that even if it gets
>incremented only once, that still only makes 1 boot count as successful.
>
>This commit makes the selinux-autorelabel script call:
>grub2-editenv - incr boot_indeterminate
>for proper integration with this new grub feature.
>
>Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>---
> selinux-autorelabel | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/selinux-autorelabel b/selinux-autorelabel
>index b17bd8d..22c2143 100755
>--- a/selinux-autorelabel
>+++ b/selinux-autorelabel
>@@ -59,6 +59,9 @@ relabel_selinux() {
>     rm -f  /.autorelabel
>     /usr/lib/dracut/dracut-initramfs-restore
>     efi_set_boot_next
>+    if [ -x /usr/bin/grub2-editenv ]; then
>+        grub2-editenv - incr boot_indeterminate >/dev/null 2>&1
>+    fi
>     sync
>     systemctl --force reboot
> }
>-- 
>2.17.1
>

Actions: View | Diff

Attachments on bug 1592221: 1452558 | 1452559