pool/os-prober
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 726441 from home:michael-chang:branches:Base:System

Browse Source 
- Fix duplicated distro detected on btrfs multiple device (bsc#1142858)
  * os-prober-btrfs-multiple-device.patch

- 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

OBS-URL: https://build.opensuse.org/request/show/726441
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=98
This commit is contained in:
Michael Chang 2019-08-27 10:14:38 +00:00 committed by Git OBS Bridge
parent c3cca9cfc0
commit ce7b65b98c
5 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
os-prober-1.76.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f84f7758596590a40c051a9ce2b66c4f26119fe9078d3771070b22b12183c1f
size 26176

35
os-prober-btrfs-multiple-device.patch Normal file
View File

@ -0,0 +1,35 @@
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"

16
os-prober.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Aug 13 08:12:58 UTC 2019 - Michael Chang <mchang@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 <mchang@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
-------------------------------------------------------------------
Tue Apr 23 07:42:32 UTC 2019 - mchang <mchang@suse.com>

5
os-prober.spec
View File

@ -23,7 +23,7 @@ Summary: Probes disks on the system for installed operating systems
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 @@ Patch27: os-prober-make-btrfsprogs-optional.patch
# 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 @@ cp %{SOURCE1} .
%patch26 -p1
%patch27 -p1
%patch28 -p1
%patch29 -p1
find . -name \*.orig -delete
%build

3
os-prober_1.76.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d3a580610e0148ee1fea98de993b27b856870fb0a31e9ce1a33be2654e2c64ed
size 26432