From f09f144a2f04bd2775367a0df0a2e7900d96d6a1 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Tue, 1 Sep 2020 16:59:53 +0800 Subject: [PATCH] remove 08_fallback_counting.in apply grubby --- Makefile.util.def | 6 ------ util/grub.d/08_fallback_counting.in | 24 ------------------------ 2 files changed, 30 deletions(-) delete mode 100644 util/grub.d/08_fallback_counting.in diff --git a/Makefile.util.def b/Makefile.util.def index f3a6996..3473947 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -458,12 +458,6 @@ script = { }; script = { - name = '08_fallback_counting'; - common = util/grub.d/08_fallback_counting.in; - installdir = grubconf; -}; - -script = { name = '12_menu_auto_hide'; common = util/grub.d/12_menu_auto_hide.in; installdir = grubconf; diff --git a/util/grub.d/08_fallback_counting.in b/util/grub.d/08_fallback_counting.in deleted file mode 100644 index 2e2c3ff..0000000 --- a/util/grub.d/08_fallback_counting.in +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh -e -# Fallback Countdown -# -# This snippet depends on 10_reset_boot_success and needs to be kept in sync. -# -# The boot_counter env var can be used to count down boot attempts after an -# OSTree upgrade and choose the rollback deployment when 0 is reached. -# Both boot_counter=X and boot_success=1 need to be set from userspace. -cat << EOF -insmod increment -# Check if boot_counter exists and boot_success=0 to activate this behaviour. -if [ -n "\${boot_counter}" -a "\${boot_success}" = "0" ]; then - # if countdown has ended, choose to boot rollback deployment, - # i.e. default=1 on OSTree-based systems. - if [ "\${boot_counter}" = "0" -o "\${boot_counter}" = "-1" ]; then - set default=1 - set boot_counter=-1 - # otherwise decrement boot_counter - else - decrement boot_counter - fi - save_env boot_counter -fi -EOF -- 1.8.3.1