rpm/os-prober
SHA256
1
0
Fork 0
forked from pool/os-prober
Code Pull Requests Activity

Accepting request 639760 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/639760
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/os-prober?expand=0&rev=46
This commit is contained in:
Dominique Leuenberger 2018-10-09 13:52:15 +00:00 committed by Git OBS Bridge
commit 1fd2aa0812
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
os-prober-multiple-initrd.patch Normal file
View File

@ -0,0 +1,32 @@
Index: os-prober/linux-boot-probes/mounted/common/40grub2
===================================================================
--- os-prober.orig/linux-boot-probes/mounted/common/40grub2
+++ os-prober/linux-boot-probes/mounted/common/40grub2
@@ -19,11 +19,11 @@ entry_result () {
# if path is not relative to subvolume make it relative
kernel=${kernel#${bsv}}
kernelfile=$kernel
- initrd=${initrd#${bsv}}
+ initrd=`echo $initrd | sed -e "s!^${bsv}!!" -e "s!\\(\\s\\)${bsv}!\\1!g"`
if [ "x$GRUB_FS" != "xbtrfs" -o "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" != "xtrue" ]; then
# absolute path needed: prepend subvolume if $kernel isn't empty
kernel=${kernel:+${bsv}}${kernel}
- initrd=${initrd:+${bsv}}${initrd}
+ initrd=`echo $initrd | sed -e "s!\\(\\S\\+\\)!${bsv}\\1!g"`
fi
# assumed: rootsv != bootsv if rootsv isn't ancestor of bootsv
[ "$partition" != "$bootpart" -o "$rootsv" != "$bootsv" ] && kernelfile="/boot${kernelfile}"
@@ -105,10 +105,11 @@ parse_grub_menu () {
fi
;;
initrd|initrdefi|initrd16)
- initrd="$(echo "$2" | sed 's/(.*)//')"
+ shift
+ initrd="$(echo "$@" | sed 's/(\S*)//g')"
# Initrd same.
if [ "$partition" != "$bootpart" -a "$type" != "btrfs" ]; then
- initrd="/boot$initrd"
+ initrd=`echo $initrd | sed -e 's!\(\S\+\)!/boot\1!g'`
fi
;;
"}")

6
os-prober.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 31 09:16:55 UTC 2018 - mchang@suse.com
- UEFI Grub does not insert Arch Linux entry correctly (boo#1101942)
* os-prober-multiple-initrd.patch
-------------------------------------------------------------------
Thu Jun 14 07:11:24 UTC 2018 - josef.moellers@suse.com

7
os-prober.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package os-prober
#
# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@ Name: os-prober
Version: 1.74
Release: 0
Summary: Probes disks on the system for installed operating systems
License: GPL-2.0+
License: GPL-2.0-or-later
Group: System/Boot
Url: http://kitenet.net/~joey/code/os-prober/
Source0: http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.xz
@ -66,6 +66,8 @@ Patch23: os-prober-linux-distro-avoid-expensive-ld-file-test.patch
Patch24: os-prober-linux-distro-parse-os-release.patch
# PATCH-FIX-OPENSUSE: Windows 10 is not listed in the grub menu (bsc#1076779)
Patch25: os-prober-05efi-blkid.patch
# PATCH-FIX-OPENSUSE: UEFI Grub does not insert Arch Linux entry correctly (boo#1101942)
Patch26: os-prober-multiple-initrd.patch
Requires: /bin/grep
Requires: /bin/sed
Requires: /sbin/modprobe
@ -109,6 +111,7 @@ cp %{SOURCE1} .
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1
find . -name \*.orig -delete
%build