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

Accepting request 214009 from home:arvidjaar:grub2-next

Browse Source 
- fix os-prober-btrfsfix.patch - current "btrfs subvolume list -s"
  adds some extra fields. Adjust field number to get subvolume name.

OBS-URL: https://build.opensuse.org/request/show/214009
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=37
This commit is contained in:
Michael Chang 2014-01-16 03:50:40 +00:00 committed by Git OBS Bridge
parent 639c2fee1c
commit 9a197a26a1
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os-prober-btrfsfix.patch
View File

@ -314,7 +314,7 @@ Index: os-prober-1.57/os-probes/common/50mounted-tests
+ # besides regular subvols, get ro and snapshot so thet can be excluded + # besides regular subvols, get ro and snapshot so thet can be excluded
+ subvols=$(btrfs subvolume list "$tmpmnt" | cut -d ' ' -f 9) + subvols=$(btrfs subvolume list "$tmpmnt" | cut -d ' ' -f 9)
+ rosubvols=$(btrfs subvolume list -r "$tmpmnt" | cut -d ' ' -f 9) + rosubvols=$(btrfs subvolume list -r "$tmpmnt" | cut -d ' ' -f 9)
+ sssubvols=$(btrfs subvolume list -s "$tmpmnt" | cut -d ' ' -f 9) + sssubvols=$(btrfs subvolume list -s "$tmpmnt" | cut -d ' ' -f 14)
+ if ! umount "$tmpmnt"; then + if ! umount "$tmpmnt"; then
+ warn "failed to umount btrfs volume on $tmpmnt" + warn "failed to umount btrfs volume on $tmpmnt"
+ rmdir "$tmpmnt" || true + rmdir "$tmpmnt" || true

6
os-prober.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 15 15:59:02 UTC 2014 - arvidjaar@gmail.com
- fix os-prober-btrfsfix.patch - current "btrfs subvolume list -s"
adds some extra fields. Adjust field number to get subvolume name.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 18 04:16:03 UTC 2013 - mchang@suse.com Wed Dec 18 04:16:03 UTC 2013 - mchang@suse.com

4
os-prober.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package os-prober # spec file for package os-prober
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -55,12 +55,12 @@ Patch13: os-prober-fix-btrfs-subvol-mounted-tests.patch
Requires: /bin/grep Requires: /bin/grep
Requires: /bin/sed Requires: /bin/sed
Requires: /sbin/modprobe Requires: /sbin/modprobe
Requires: btrfsprogs
Requires: coreutils Requires: coreutils
Requires: dmraid Requires: dmraid
Requires: lvm2 Requires: lvm2
Requires: udev Requires: udev
Requires: util-linux Requires: util-linux
Requires: btrfsprogs
%description %description
This package detects other OSes available on a system and outputs the results This package detects other OSes available on a system and outputs the results