Sync from SUSE:ALP:Source:Standard:1.0 perl-Bootloader revision 08202626ee20767f46475e65a60d3c5c

This commit is contained in:
Adrian Schröter 2024-09-10 11:42:03 +02:00
parent 03856e0308
commit 39c1f14b98
3 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,27 @@
From eacebfbf81a4bec260341ae02b5cb4e5828a2932 Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <wfeldt@opensuse.org>
Date: Thu, 7 Sep 2023 10:43:25 +0200
Subject: [PATCH] bootloader_entry script can have an optional 'force-default'
argument (bsc#1215064)
---
pbl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pbl b/pbl
index 471c92f..570bafa 100755
--- a/pbl
+++ b/pbl
@@ -300,7 +300,8 @@ if($program eq 'pbl') {
}
if($program eq 'bootloader_entry') {
- if($ARGV[0] =~ /^(add|remove)$/ && @ARGV == 5) {
+ # there might be an optional 6th argument 'force-default'
+ if($ARGV[0] =~ /^(add|remove)$/ && @ARGV >= 5) {
push @todo, [ "$ARGV[0]-kernel", @ARGV[2..4] ]
}
else {
--
2.35.3

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Sep 9 07:22:17 UTC 2024 - Marcus Meissner <meissner@suse.com>
- 0001-bootloader_entry-script-can-have-an-optional-force-d.patch
bootloader_entry script can have an optional 'force-default' argument (bsc#1215064)
--------------------------------------------------------------------
Mon Jul 3 12:40:36 UTC 2023 - wfeldt@opensuse.org

View File

@ -36,6 +36,8 @@ License: GPL-2.0-or-later
Group: System/Boot
URL: https://github.com/openSUSE/perl-bootloader
Source: %{name}-%{version}.tar.xz
# from git
Patch0: 0001-bootloader_entry-script-can-have-an-optional-force-d.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: rubygem(asciidoctor)
@ -46,6 +48,7 @@ Shell script wrapper for configuring various boot loaders.
%prep
%setup -q
%patch0 -p1
%build