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-05-02 16:18:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
and /work/SRC/openSUSE:Factory/.os-prober.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober"
Tue May 2 16:18:19 2023 rev:58 rq:1083914 version:1.81
Changes:
--------
--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2023-01-04
18:09:52.308288810 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new.1533/os-prober.changes
2023-05-02 16:18:22.573579199 +0200
@@ -1,0 +2,6 @@
+Thu Apr 27 22:23:25 UTC 2023 - Lukas Müller <expee...@outlook.com>
+
+- Properly handle /boot on btrfs without subvolumes (boo#1210467).
+ * os-prober-fix-btrfs-boot-without-subvol.patch
+
+-------------------------------------------------------------------
New:
----
os-prober-fix-btrfs-boot-without-subvol.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ os-prober.spec ++++++
--- /var/tmp/diff_new_pack.E6JBkx/_old 2023-05-02 16:18:23.361583871 +0200
+++ /var/tmp/diff_new_pack.E6JBkx/_new 2023-05-02 16:18:23.365583895 +0200
@@ -1,7 +1,7 @@
#
# spec file for package os-prober
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -75,6 +75,8 @@
Patch29: os-prober-btrfs-multiple-device.patch
# PATCH-FIX-OPENSUSE: 40grub2: debug messages (bsc#1101735)
Patch30: os-prober-disable-debug.patch
+# PATCH-FIX-OPENSUSE: linux-boot-prober does not handle btrfs /boot without
subvolumes well (boo#1210467)
+Patch31: os-prober-fix-btrfs-boot-without-subvol.patch
Requires: /bin/grep
Requires: /bin/sed
Requires: /sbin/modprobe
++++++ os-prober-fix-btrfs-boot-without-subvol.patch ++++++
Index: os-prober/linux-boot-prober
===================================================================
--- os-prober.orig/linux-boot-prober
+++ os-prober/linux-boot-prober
@@ -90,15 +90,9 @@ if [ "$type" = btrfs ]; then
# /boot is part of the root
bootpart="$partition"
bootsv="$subvol"
- elif echo "$bootmnt" | cut -d ' ' -f 3 | grep -q "btrfs"; then
+ elif echo "$bootmnt" | cut -d ' ' -f 3 | grep -q "btrfs" && echo
"$bootmnt" | cut -d ' ' -f 4 | grep -q "subvol="; then
# separate btrfs /boot subvolume
bootsv=$(echo "$bootmnt" | cut -d ' ' -f 4 | sed -n
's!\(^subvol=\|.*,subvol=\)\([^,]\+\).*!\2!p')
- if [ -z "$bootsv" ]; then
- warn "no subvolume in entry: $bootmnt"
- umount "$tmpmnt" 2>/dev/null
- rmdir "$tmpmnt" 2>/dev/null
- exit 1
- fi
bootuuid=$(echo "$bootmnt" | cut -d ' ' -f 1 | sed -n
's/UUID=\("\(.*\)"\|\(.*\)\)/\2\3/p')
debug "mounting btrfs $tmpmnt/boot UUID=$bootuuid
subvol=$bootsv"
bindfrom=$(check_btrfs_mounted $bootsv $bootuuid)
