Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package os-prober for openSUSE:Factory
checked in at 2023-01-04 18:09:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
and /work/SRC/openSUSE:Factory/.os-prober.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober"
Wed Jan 4 18:09:50 2023 rev:57 rq:1046401 version:1.81
Changes:
--------
--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2021-07-30
23:21:52.227656586 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new.1563/os-prober.changes
2023-01-04 18:09:52.308288810 +0100
@@ -1,0 +2,13 @@
+Thu Dec 22 04:54:11 UTC 2022 - Michael Chang <mch...@suse.com>
+
+- update to 1.81
+- use %autosetup macro to unpack source and apply patch
+- drop patch for upstream
+ * os-prober-multiple-initrd.patch
+- rediff
+ * Improve-btrfs-handling-on-os-probing-for-grub2.patch
+ * os-prober-linux-distro-avoid-expensive-ld-file-test.patch
+ * os-prober-linux-distro-parse-os-release.patch
+ * os-prober-linux-secure-boot.patch
+
+-------------------------------------------------------------------
Old:
----
os-prober-1.79.tar.bz2
os-prober-multiple-initrd.patch
New:
----
os-prober-1.81.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ os-prober.spec ++++++
--- /var/tmp/diff_new_pack.ki5GWB/_old 2023-01-04 18:09:53.252294374 +0100
+++ /var/tmp/diff_new_pack.ki5GWB/_new 2023-01-04 18:09:53.260294421 +0100
@@ -1,7 +1,7 @@
#
# spec file for package os-prober
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: os-prober
-Version: 1.79
+Version: 1.81
Release: 0
Summary: Probes disks on the system for installed operating systems
License: GPL-2.0-or-later
@@ -66,8 +66,6 @@
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
# PATCH-FIX-OPENSUSE: os-prober unconditionally pulls btrfsprogs (boo#1118279)
Patch27: os-prober-make-btrfsprogs-optional.patch
# PATCH-FIX-OPENSUSE: os-prober isn't compatible with transactional update
(boo#1125729)
@@ -97,33 +95,8 @@
distributions can be added easily.
%prep
-%setup -q
+%autosetup -p1
cp %{SOURCE1} .
-%patch0 -p1
-%patch1 -p1
-%patch3 -p1
-%patch5 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
find . -name \*.orig -delete
%build
++++++ Improve-btrfs-handling-on-os-probing-for-grub2.patch ++++++
--- /var/tmp/diff_new_pack.ki5GWB/_old 2023-01-04 18:09:53.308294704 +0100
+++ /var/tmp/diff_new_pack.ki5GWB/_new 2023-01-04 18:09:53.312294728 +0100
@@ -35,14 +35,12 @@
Signed-off-by: Michael Chang <mch...@suse.com>
---
- linux-boot-probes/mounted/common/40grub2 | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
+ linux-boot-probes/mounted/common/40grub2 | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
-Index: os-prober-1.61/linux-boot-probes/mounted/common/40grub2
-===================================================================
---- os-prober-1.61.orig/linux-boot-probes/mounted/common/40grub2
-+++ os-prober-1.61/linux-boot-probes/mounted/common/40grub2
-@@ -14,9 +14,19 @@ bootsv="$6"
+--- a/linux-boot-probes/mounted/common/40grub2
++++ b/linux-boot-probes/mounted/common/40grub2
+@@ -14,9 +14,19 @@
found_item=0
entry_result () {
@@ -65,7 +63,7 @@
else
kernelfile=$kernel
fi
-@@ -81,7 +91,7 @@ parse_grub_menu () {
+@@ -81,7 +91,7 @@
ignore_item=1
fi
;;
@@ -74,7 +72,7 @@
# Hack alert: sed off any (hdn,n) but
# assume the kernel is on the same
# partition.
-@@ -90,14 +100,14 @@ parse_grub_menu () {
+@@ -90,18 +100,18 @@
parameters="$@"
# Systems with a separate /boot will not have
# the path to the kernel in grub.cfg.
@@ -85,11 +83,15 @@
;;
- initrd|initrdefi)
+ initrd|initrdefi|initrd16)
- initrd="$(echo "$2" | sed 's/(.*)//')"
- # Initrd same.
-- if [ "$partition" != "$bootpart" ]; then
-+ if [ "$partition" != "$bootpart" -a "$type" !=
"btrfs" ]; then
- initrd="/boot$initrd"
- fi
- ;;
+ shift
+ initrd=""
+ for initrd_path in "$@"; do
+ # sed hack, as above
+ initrd_path="$(echo "$initrd_path" |
sed 's/(.*)//')"
+ # Initrd same.
+- if [ "$partition" != "$bootpart" ]; then
++ if [ "$partition" != "$bootpart" -a
"$type" != "btrfs" ]; then
+ initrd_path="/boot$initrd_path"
+ fi
+ if [ -z "$initrd" ]; then
++++++ os-prober-1.79.tar.bz2 -> os-prober-1.81.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-prober-1.79/debian/changelog
new/os-prober-1.81/debian/changelog
--- old/os-prober-1.79/debian/changelog 2021-07-11 00:54:48.000000000 +0200
+++ new/os-prober-1.81/debian/changelog 2022-07-18 15:15:33.000000000 +0200
@@ -1,3 +1,51 @@
+os-prober (1.81) unstable; urgency=medium
+
+ * Team upload
+
+ [ Pascal Hambourg ]
+ * Add Windows 11 detection.
+
+ -- Holger Wansing <hwans...@mailbox.org> Mon, 18 Jul 2022 14:32:39 +0200
+
+os-prober (1.80) unstable; urgency=medium
+
+ * Team upload
+
+ [ Samuel Thibault ]
+ * control: Enable mount dependency only on linux, enable freebsd-utils on
+ kfreebsd instead. (Closes: #1006590)
+
+ [ General Chaos ]
+ * Handle multiple initrd paths, as used in some distros
+
+ [ Gaël PORTAY ]
+ * Fix "os-prober: call dmraid -r *once*".
+
+ [ Timo Gurr ]
+ * Add Exherbo Linux detection (Closes: #755804)
+
+ [ Pascal Hambourg ]
+ * Sort Linux kernels in reverse version order if no boot loader config file
+ found (Closes: #741889)
+
+ [ Sergei Galkin ]
+ * Add ntfs3 for 5.15 kernel.
+
+ [ rakslice ]
+ * detect alpine initramfs files
+
+ [ Luke Shumaker ]
+ * Fall back to looking for /usr/lib/os-release.
+
+ [ Debian Janitor ]
+ * Bump debhelper from deprecated 9 to 13.
+ * Set debhelper-compat version in Build-Depends.
+ * Remove constraints unnecessary since buster:
+ + Build-Depends: Drop versioned constraint on dpkg-dev.
+ + os-prober-udeb: Drop versioned constraint on anna in Depends.
+
+ -- Holger Wansing <hwans...@mailbox.org> Thu, 26 May 2022 23:16:53 +0200
+
os-prober (1.79) unstable; urgency=medium
* Team upload
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-prober-1.79/debian/compat
new/os-prober-1.81/debian/compat
--- old/os-prober-1.79/debian/compat 2021-07-11 00:54:48.000000000 +0200
+++ new/os-prober-1.81/debian/compat 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-prober-1.79/debian/control
new/os-prober-1.81/debian/control
--- old/os-prober-1.79/debian/control 2021-07-11 00:54:48.000000000 +0200
+++ new/os-prober-1.81/debian/control 2022-07-18 15:15:33.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Install System Team <debian-b...@lists.debian.org>
Uploaders: Colin Watson <cjwat...@debian.org>, Steve McIntyre
<93...@debian.org>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.15.7)
+Build-Depends: debhelper-compat (= 13)
Standards-Version: 3.9.4
Vcs-Browser: https://salsa.debian.org/installer-team/os-prober
Vcs-Git: https://salsa.debian.org/installer-team/os-prober.git
@@ -11,7 +11,7 @@
Package: os-prober-udeb
Package-Type: udeb
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, di-utils-mapdevfs, anna (>=
1.16), grub-mount-udeb [linux-any kfreebsd-any]
+Depends: ${misc:Depends}, ${shlibs:Depends}, di-utils-mapdevfs, anna,
grub-mount-udeb [linux-any kfreebsd-any]
Provides: os-prober
Description: utility to detect other OSes on a set of drives
This package is to be used by boot loader installers to detect other OSes
@@ -21,7 +21,7 @@
Package: os-prober
Architecture: any
Section: utils
-Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common [linux-any
kfreebsd-any], mount
+Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common [linux-any
kfreebsd-any], mount [linux-any], freebsd-utils [kfreebsd-any]
Description: utility to detect other OSes on a set of drives
This package detects other OSes available on a system and outputs the
results in a generic machine-readable format.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-prober-1.79/debian/gbp.conf
new/os-prober-1.81/debian/gbp.conf
--- old/os-prober-1.79/debian/gbp.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/os-prober-1.81/debian/gbp.conf 2022-07-18 15:15:33.000000000 +0200
@@ -0,0 +1,2 @@
+[buildpackage]
+debian-tag=%(version)s
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/os-prober-1.79/linux-boot-probes/mounted/common/40grub2
new/os-prober-1.81/linux-boot-probes/mounted/common/40grub2
--- old/os-prober-1.79/linux-boot-probes/mounted/common/40grub2 2021-07-11
00:54:48.000000000 +0200
+++ new/os-prober-1.81/linux-boot-probes/mounted/common/40grub2 2022-07-18
15:15:33.000000000 +0200
@@ -78,11 +78,21 @@
fi
;;
initrd)
- initrd="$(echo "$2" | sed 's/(.*)//')"
- # Initrd same.
- if [ "$partition" != "$bootpart" ]; then
- initrd="/boot$initrd"
- fi
+ shift
+ initrd=""
+ for initrd_path in "$@"; do
+ # sed hack, as above
+ initrd_path="$(echo "$initrd_path" |
sed 's/(.*)//')"
+ # Initrd same.
+ if [ "$partition" != "$bootpart" ]; then
+ initrd_path="/boot$initrd_path"
+ fi
+ if [ -z "$initrd" ]; then
+ initrd="$initrd_path"
+ else
+ initrd="$initrd $initrd_path"
+ fi
+ done
;;
"}")
entry_result
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/os-prober-1.79/linux-boot-probes/mounted/common/90fallback
new/os-prober-1.81/linux-boot-probes/mounted/common/90fallback
--- old/os-prober-1.79/linux-boot-probes/mounted/common/90fallback
2021-07-11 00:54:48.000000000 +0200
+++ new/os-prober-1.81/linux-boot-probes/mounted/common/90fallback
2022-07-18 15:15:33.000000000 +0200
@@ -19,7 +19,7 @@
else
kernbootpart="$partition"
fi
- for kernfile in $(eval ls "$mpoint$kernpat" 2>/dev/null); do
+ for kernfile in $(eval ls -vr "$mpoint$kernpat" 2>/dev/null); do
kernbasefile=$(echo "$kernfile" | sed "s!^$mpoint!!")
if [ -f "$kernfile" ] && [ ! -L "$kernfile" ]; then
initrdname=$(echo "$kernfile" | sed
"s/vmlinu[zx]/initrd\*/")
@@ -34,8 +34,10 @@
initrdname3=$(echo "$kernfile" | sed
"s/vmlinu[zx]/initramfs\*/" | sed 's/$/.img/')
# And Gentoo's also
initrdname4=$(echo "$kernfile" | sed
"s/kernel/initramfs\*/")
+ # Also Alpine
+ initrdname5=$(echo "$kernfile" | sed
"s/vmlinu[zx]/initramfs\*/")
foundinitrd=0
- for initrd in $(eval ls "$initrdname" "$initrdname1"
"$initrdname2" "$initrdname3" "$initrdname4" 2>/dev/null); do
+ for initrd in $(eval ls "$initrdname" "$initrdname1"
"$initrdname2" "$initrdname3" "$initrdname4" "$initrdname5" 2>/dev/null); do
if [ "$initrd" != "$kernfile" ] && [ -f
"$initrd" ] && [ ! -L "$initrd" ]; then
initrd=$(echo "$initrd" | sed
"s!^$mpoint!!")
result
"$partition:$kernbootpart::$kernbasefile:$initrd:root=$mappedpartition"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-prober-1.79/os-prober new/os-prober-1.81/os-prober
--- old/os-prober-1.79/os-prober 2021-07-11 00:54:48.000000000 +0200
+++ new/os-prober-1.81/os-prober 2022-07-18 15:15:33.000000000 +0200
@@ -15,9 +15,8 @@
}
: >"$OS_PROBER_TMP/dmraid-map"
-DMRAID=$(type dmraid >/dev/null 2>&1 || true)
-if [ "$DMRAID" ]; then
- dmraid -r -c >"$OS_PROBER_TMP/dmraid-map"
+if type dmraid >/dev/null 2>&1; then
+ dmraid -r -c >"$OS_PROBER_TMP/dmraid-map" || true
fi
on_sataraid () {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-prober-1.79/os-probes/mounted/arm64/20microsoft
new/os-prober-1.81/os-probes/mounted/arm64/20microsoft
--- old/os-prober-1.79/os-probes/mounted/arm64/20microsoft 2021-07-11
00:54:48.000000000 +0200
+++ new/os-prober-1.81/os-probes/mounted/arm64/20microsoft 2022-07-18
15:15:33.000000000 +0200
@@ -15,7 +15,7 @@
# Weed out stuff that doesn't apply to us
case "$type" in
- ntfs|ntfs-3g) debug "$1 is a NTFS partition" ;;
+ ntfs3|ntfs|ntfs-3g) debug "$1 is a NTFS partition" ;;
vfat) debug "$1 is a FAT32 partition" ;;
msdos) debug "$1 is a FAT16 partition" ;;
fat) debug "$1 is a FAT partition (mounted by GRUB)" ;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/os-prober-1.79/os-probes/mounted/common/90linux-distro
new/os-prober-1.81/os-probes/mounted/common/90linux-distro
--- old/os-prober-1.79/os-probes/mounted/common/90linux-distro 2021-07-11
00:54:48.000000000 +0200
+++ new/os-prober-1.81/os-probes/mounted/common/90linux-distro 2022-07-18
15:15:33.000000000 +0200
@@ -21,6 +21,9 @@
if [ -e "$dir/etc/os-release" ]; then
short="$(grep ^NAME= "$dir/etc/os-release" | sed 's/^[^=]*=//;
s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g; s/[[:space:]].*//')"
long="$(grep ^PRETTY_NAME= "$dir/etc/os-release" | sed
's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g')"
+ elif [ -e "$dir/usr/lib/os-release" ]; then
+ short="$(grep ^NAME= "$dir/usr/lib/os-release" | sed
's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g; s/[[:space:]].*//')"
+ long="$(grep ^PRETTY_NAME= "$dir/usr/lib/os-release" | sed
's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g')"
elif [ -e "$dir/etc/debian_version" ]; then
short="Debian"
long="$(printf "Debian GNU/Linux (%s)\n" "$(cat
"$dir/etc/debian_version")")"
@@ -137,6 +140,9 @@
elif [ -e "$dir/etc/devuan_version" ]; then
short="Devuan"
long="$(printf "Devuan GNU/Linux (%s)\n" "$(cat
"$dir/etc/devuan_version")")"
+ elif [ -e "$dir/etc/exherbo-release" ]; then
+ short="Exherbo"
+ long="Exherbo Linux"
else
short="Linux"
long="unknown Linux distribution"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/os-prober-1.79/os-probes/mounted/x86/20microsoft
new/os-prober-1.81/os-probes/mounted/x86/20microsoft
--- old/os-prober-1.79/os-probes/mounted/x86/20microsoft 2021-07-11
00:54:48.000000000 +0200
+++ new/os-prober-1.81/os-probes/mounted/x86/20microsoft 2022-07-18
15:15:33.000000000 +0200
@@ -15,7 +15,7 @@
# Weed out stuff that doesn't apply to us
case "$type" in
- ntfs|ntfs-3g) debug "$1 is a NTFS partition" ;;
+ ntfs3|ntfs|ntfs-3g) debug "$1 is a NTFS partition" ;;
vfat) debug "$1 is a FAT32 partition" ;;
msdos) debug "$1 is a FAT16 partition" ;;
fat) debug "$1 is a FAT partition (mounted by GRUB)" ;;
@@ -31,7 +31,9 @@
for boot in $(item_in_dir boot "$2"); do
bcd=$(item_in_dir bcd "$2/$boot")
if [ -n "$bcd" ]; then
- if grep -aqs "W.i.n.d.o.w.s. .1.0" "$2/$boot/$bcd";
then
+ if grep -aqs "W.i.n.d.o.w.s. .1.1" "$2/$boot/$bcd";
then
+ long="Windows 11"
+ elif grep -aqs "W.i.n.d.o.w.s. .1.0" "$2/$boot/$bcd";
then
long="Windows 10"
elif grep -aqs "W.i.n.d.o.w.s. .8" "$2/$boot/$bcd"; then
long="Windows 8"
++++++ os-prober-linux-distro-avoid-expensive-ld-file-test.patch ++++++
--- /var/tmp/diff_new_pack.ki5GWB/_old 2023-01-04 18:09:53.476295695 +0100
+++ /var/tmp/diff_new_pack.ki5GWB/_new 2023-01-04 18:09:53.480295718 +0100
@@ -1,8 +1,11 @@
-Index: os-prober/os-probes/mounted/common/90linux-distro
-===================================================================
---- os-prober.orig/os-probes/mounted/common/90linux-distro
-+++ os-prober/os-probes/mounted/common/90linux-distro
-@@ -10,147 +10,133 @@ type="$3"
+---
+ os-prober | 5
+ os-probes/mounted/common/90linux-distro | 280
+++++++++++++++-----------------
+ 2 files changed, 138 insertions(+), 147 deletions(-)
+
+--- a/os-probes/mounted/common/90linux-distro
++++ b/os-probes/mounted/common/90linux-distro
+@@ -10,153 +10,139 @@
uuid="$4"
subvol="$5"
@@ -19,6 +22,9 @@
- if [ -e "$dir/etc/os-release" ]; then
- short="$(grep ^NAME= "$dir/etc/os-release" | sed 's/^[^=]*=//;
s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g; s/[[:space:]].*//')"
- long="$(grep ^PRETTY_NAME= "$dir/etc/os-release" | sed
's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g')"
+- elif [ -e "$dir/usr/lib/os-release" ]; then
+- short="$(grep ^NAME= "$dir/usr/lib/os-release" | sed
's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g; s/[[:space:]].*//')"
+- long="$(grep ^PRETTY_NAME= "$dir/usr/lib/os-release" | sed
's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g')"
- elif [ -e "$dir/etc/debian_version" ]; then
- short="Debian"
- long="$(printf "Debian GNU/Linux (%s)\n" "$(cat
"$dir/etc/debian_version")")"
@@ -135,6 +141,9 @@
- elif [ -e "$dir/etc/devuan_version" ]; then
- short="Devuan"
- long="$(printf "Devuan GNU/Linux (%s)\n" "$(cat
"$dir/etc/devuan_version")")"
+- elif [ -e "$dir/etc/exherbo-release" ]; then
+- short="Exherbo"
+- long="Exherbo Linux"
- else
- short="Linux"
- long="unknown Linux distribution"
@@ -150,6 +159,9 @@
+if [ -e "$dir/etc/os-release" ]; then
+ short="$(grep ^NAME= "$dir/etc/os-release" | sed 's/^[^=]*=//;
s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g; s/[[:space:]].*//')"
+ long="$(grep ^PRETTY_NAME= "$dir/etc/os-release" | sed 's/^[^=]*=//;
s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g')"
++elif [ -e "$dir/usr/lib/os-release" ]; then
++ short="$(grep ^NAME= "$dir/usr/lib/os-release" | sed 's/^[^=]*=//;
s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g; s/[[:space:]].*//')"
++ long="$(grep ^PRETTY_NAME= "$dir/usr/lib/os-release" | sed
's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g')"
+elif [ -e "$dir/etc/debian_version" ]; then
+ short="Debian"
+ long="$(printf "Debian GNU/Linux (%s)\n" "$(cat
"$dir/etc/debian_version")")"
@@ -266,6 +278,9 @@
+elif [ -e "$dir/etc/devuan_version" ]; then
+ short="Devuan"
+ long="$(printf "Devuan GNU/Linux (%s)\n" "$(cat
"$dir/etc/devuan_version")")"
++elif [ -e "$dir/etc/exherbo-release" ]; then
++ short="Exherbo"
++ long="Exherbo Linux"
else
exit 1
fi
@@ -277,11 +292,9 @@
+ result "$partition:$long:$label:linux"
+fi
+exit 0
-Index: os-prober/os-prober
-===================================================================
---- os-prober.orig/os-prober
-+++ os-prober/os-prober
-@@ -186,6 +186,11 @@ for partition in $(partitions); do
+--- a/os-prober
++++ b/os-prober
+@@ -185,6 +185,11 @@
# be handled by 50mounted-tests so we can do a subvol only once.
type=$(blkid -o value -s TYPE $mapped || true)
if [ "$type" = btrfs ]; then
++++++ os-prober-linux-distro-parse-os-release.patch ++++++
--- /var/tmp/diff_new_pack.ki5GWB/_old 2023-01-04 18:09:53.492295789 +0100
+++ /var/tmp/diff_new_pack.ki5GWB/_new 2023-01-04 18:09:53.496295812 +0100
@@ -1,8 +1,10 @@
-Index: os-prober/os-probes/mounted/common/90linux-distro
-===================================================================
---- os-prober.orig/os-probes/mounted/common/90linux-distro
-+++ os-prober/os-probes/mounted/common/90linux-distro
-@@ -10,7 +10,18 @@ type="$3"
+---
+ os-probes/mounted/common/90linux-distro | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+--- a/os-probes/mounted/common/90linux-distro
++++ b/os-probes/mounted/common/90linux-distro
+@@ -10,7 +10,18 @@
uuid="$4"
subvol="$5"
@@ -21,5 +23,5 @@
+elif [ -e "$dir/etc/os-release" ]; then
short="$(grep ^NAME= "$dir/etc/os-release" | sed 's/^[^=]*=//;
s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g; s/[[:space:]].*//')"
long="$(grep ^PRETTY_NAME= "$dir/etc/os-release" | sed 's/^[^=]*=//;
s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g')"
- elif [ -e "$dir/etc/debian_version" ]; then
+ elif [ -e "$dir/usr/lib/os-release" ]; then
++++++ os-prober-linux-secure-boot.patch ++++++
--- /var/tmp/diff_new_pack.ki5GWB/_old 2023-01-04 18:09:53.508295883 +0100
+++ /var/tmp/diff_new_pack.ki5GWB/_new 2023-01-04 18:09:53.512295907 +0100
@@ -5,11 +5,13 @@
Recognize initrdefi and linuxefi too. Whether linux/initrd or
linuxefi/initrdefi will be emitted is controlled by SECURE_BOOT
setting in /etc/sysconfig/bootloader.
-Index: os-prober-1.61/linux-boot-probes/mounted/common/40grub2
-===================================================================
---- os-prober-1.61.orig/linux-boot-probes/mounted/common/40grub2
-+++ os-prober-1.61/linux-boot-probes/mounted/common/40grub2
-@@ -71,7 +71,7 @@ parse_grub_menu () {
+---
+ linux-boot-probes/mounted/common/40grub2 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/linux-boot-probes/mounted/common/40grub2
++++ b/linux-boot-probes/mounted/common/40grub2
+@@ -71,7 +71,7 @@
ignore_item=1
fi
;;
@@ -18,13 +20,13 @@
# Hack alert: sed off any (hdn,n) but
# assume the kernel is on the same
# partition.
-@@ -84,7 +84,7 @@ parse_grub_menu () {
+@@ -84,7 +84,7 @@
kernel="/boot$kernel"
fi
;;
- initrd)
+ initrd|initrdefi)
- initrd="$(echo "$2" | sed 's/(.*)//')"
- # Initrd same.
- if [ "$partition" != "$bootpart" ]; then
+ shift
+ initrd=""
+ for initrd_path in "$@"; do
