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

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

Browse Source 
- revert os-prober-05efi-udevinfo.patch as it messed up with strings
  that could be named differently in which even with non ascil characters.

OBS-URL: https://build.opensuse.org/request/show/579241
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=79
This commit is contained in:
Michael Chang 2018-02-23 10:23:21 +00:00 committed by Git OBS Bridge
parent 4c3a7a939d
commit 0fbd11efb1
3 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
os-prober-05efi-udevinfo.patch
View File

@ -1,32 +0,0 @@
Index: os-prober/os-probes/mounted/x86/05efi
===================================================================
--- os-prober.orig/os-probes/mounted/x86/05efi
+++ os-prober/os-probes/mounted/x86/05efi
@@ -28,7 +28,7 @@ if type udevadm > /dev/null 2>&1; then
fi
if type udevinfo > /dev/null 2>&1; then
- eval "$(udevinfo -q property -n "$partition" | grep -E '^(MD_CONTAINER|ID_PART_ENTRY_(TYPE|SCHEME))=')"
+ eval "$(udevinfo -q property -n "$partition" | sed -n -e 's/\(.*\)=\(.*\)/\1="\2"/p' | grep -E '^(MD_CONTAINER|ID_PART_ENTRY_(TYPE|SCHEME)|PARTNAME)=')"
debug "$partition container is '$MD_CONTAINER'"
# Skip virtual devices unless they are known SW-RAID
@@ -48,13 +48,16 @@ if type udevinfo > /dev/null 2>&1; then
debug "$partition partition scheme is $ID_PART_ENTRY_SCHEME"
debug "$partition partition type is $ID_PART_ENTRY_TYPE"
+ debug "$partition partition name is $PARTNAME"
if [ -z "$ID_PART_ENTRY_TYPE" -o -z "$ID_PART_ENTRY_SCHEME" -o \
\( "$ID_PART_ENTRY_SCHEME" != gpt -a "$ID_PART_ENTRY_SCHEME" != dos \) -o \
\( "$ID_PART_ENTRY_SCHEME" = gpt -a "$ID_PART_ENTRY_TYPE" != c12a7328-f81f-11d2-ba4b-00a0c93ec93b \) -o \
\( "$ID_PART_ENTRY_SCHEME" = dos -a "$ID_PART_ENTRY_TYPE" != 0xef \) ]; then
- debug "$partition is not a ESP partition: exiting"
- exit 1
+ if [ -z "$PARTNAME" -o "$PARTNAME" != "EFI system partition" ]; then
+ debug "$partition is not a ESP partition: exiting"
+ exit 1
+ fi
fi
else
debug "udevinfo and udevadm missing - cannot check partition type"

6
os-prober.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Feb 23 04:40:59 UTC 2018 - mchang@suse.com
- revert os-prober-05efi-udevinfo.patch as it messed up with strings
that could be named differently in which even with non ascil characters.
-------------------------------------------------------------------
Wed Jan 31 09:46:34 UTC 2018 - mchang@suse.com

3
os-prober.spec
View File

@ -64,8 +64,6 @@ Patch22: os-prober-btrfs-always-detect-default.patch
Patch23: os-prober-linux-distro-avoid-expensive-ld-file-test.patch
# PATCH-FIX-OPENSUSE: Leap does not recognize Tumbleweed any more (bsc#997465)
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-udevinfo.patch
Requires: /bin/grep
Requires: /bin/sed
Requires: /sbin/modprobe
@ -108,7 +106,6 @@ cp %{SOURCE1} .
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
find . -name \*.orig -delete
%build