Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2019-09-07 11:24:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober" Sat Sep 7 11:24:24 2019 rev:52 rq:726443 version:1.76 Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2019-04-30 12:55:40.978203213 +0200 +++ /work/SRC/openSUSE:Factory/.os-prober.new.7948/os-prober.changes 2019-09-07 11:24:25.578503274 +0200 @@ -1,0 +2,16 @@ +Tue Aug 13 08:12:58 UTC 2019 - Michael Chang <mch...@suse.com> + +- Fix duplicated distro detected on btrfs multiple device (bsc#1142858) + * os-prober-btrfs-multiple-device.patch + +------------------------------------------------------------------- +Tue Aug 13 07:48:14 UTC 2019 - Michael Chang <mch...@suse.com> + +- Update URL for downloading source archive from Debain Salsa server + * os-prober.spec +- Added + * os-prober-1.76.tar.bz2 +- Removed + * os-prober_1.76.tar.xz + +------------------------------------------------------------------- Old: ---- os-prober_1.76.tar.xz New: ---- os-prober-1.76.tar.bz2 os-prober-btrfs-multiple-device.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.AjwSJZ/_old 2019-09-07 11:24:26.314503172 +0200 +++ /var/tmp/diff_new_pack.AjwSJZ/_new 2019-09-07 11:24:26.318503172 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0-or-later Group: System/Boot Url: https://salsa.debian.org/installer-team/os-prober -Source0: %{name}_%{version}.tar.xz +Source0: https://salsa.debian.org/installer-team/os-prober/-/archive/%{version}/%{name}-%{version}.tar.bz2 Source1: COPYING-note.txt # move newns binary outside of os-prober subdirectory, so that debuginfo # can be automatically generated for it @@ -73,6 +73,8 @@ # PATCH-FIX-OPENSUSE: os-prober isn't compatible with transactional update (boo#1125729) # PATCH-FIX-OPENSUSE: os-prober deletes subvolume on btrfs disk (boo#1130669) Patch28: os-prober-use-tmp-over-var-lib-for-transient-files.patch +# PATCH-FIX-OPENSUSE: Two TW selections is shown in GRUB after installing system with multi-device Btrfs (bsc#1142858) +Patch29: os-prober-btrfs-multiple-device.patch Requires: /bin/grep Requires: /bin/sed Requires: /sbin/modprobe @@ -118,6 +120,7 @@ %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p1 find . -name \*.orig -delete %build ++++++ os-prober-btrfs-multiple-device.patch ++++++ Index: os-prober-1.76/os-prober =================================================================== --- os-prober-1.76.orig/os-prober +++ os-prober-1.76/os-prober @@ -161,6 +161,15 @@ fi : >"$OS_PROBER_TMP/btrfs-vols" +btrfsrootdev=$(sed -n -e 's!\([^\s]\+\)\s\+\(/\|/target/boot\|/target\)\s\+btrfs!\1!p;ta;b;:a;q' "$OS_PROBER_TMP/mounted-map") +if [ -n "$btrfsrootdev" ] ; then + if btrfsrootdev="$(mapdevfs "$btrfsrootdev")"; then + btrfsrootdevuuid=$(blkid -o value -s UUID "$btrfsrootdev") + debug "btrfs is mounted as root, uuid: $btrfsrootdevuuid" + echo "$btrfsrootdevuuid" >>"$OS_PROBER_TMP/btrfs-vols" + fi +fi + for partition in $(partitions); do if ! mapped="$(mapdevfs "$partition")"; then log "Device '$partition' does not exist; skipping" @@ -183,13 +192,9 @@ for partition in $(partitions); do # 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 - mpoint=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 2) - mpoint="$(unescape_mount "$mpoint")" - if [ "$mpoint" = "/target/boot" ] || [ "$mpoint" = "/target" ] || [ "$mpoint" = "/" ]; then - continue - fi uuid=$(blkid -o value -s UUID $mapped) if grep -q "^$uuid" "$OS_PROBER_TMP/btrfs-vols" ; then + debug "skipped btrfs partition=$partition uuid=$uuid" continue fi debug "btrfs volume uuid=$uuid partition=$partition"
