From 192dc7fe8f66f70d48cbe51480fa85e80cbe8a363d2e9dcf363b00d72a5af6bb Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 1 Nov 2018 07:00:14 +0000 Subject: [PATCH] Accepting request 645672 from home:michael-chang:boo:1113615 - Fix missing grub-probe command that caused linux-boot-probe to abort prematurely. It is a mistake while rebasing patch to 1.76 (bsc#1113615) * os-prober-1.49-grub2-mount.patch OBS-URL: https://build.opensuse.org/request/show/645672 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=89 --- os-prober-1.49-grub2-mount.patch | 4 ++-- os-prober.changes | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/os-prober-1.49-grub2-mount.patch b/os-prober-1.49-grub2-mount.patch index e044206..ddcf5bb 100644 --- a/os-prober-1.49-grub2-mount.patch +++ b/os-prober-1.49-grub2-mount.patch @@ -17,7 +17,7 @@ Index: os-prober-1.76/linux-boot-probes/common/50mounted-tests =================================================================== --- os-prober-1.76.orig/linux-boot-probes/common/50mounted-tests +++ os-prober-1.76/linux-boot-probes/common/50mounted-tests -@@ -48,11 +48,12 @@ if [ ! -d "$tmpmnt" ]; then +@@ -48,11 +48,11 @@ if [ ! -d "$tmpmnt" ]; then fi mounted= @@ -28,7 +28,7 @@ Index: os-prober-1.76/linux-boot-probes/common/50mounted-tests + type grub2-probe >/dev/null 2>&1 && \ + grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then mounted=1 - type="$(grub-probe -d "$partition" -t fs)" +- type="$(grub-probe -d "$partition" -t fs)" + type="$(grub2-probe -d "$partition" -t fs)" [ "$type" ] || type=fuseblk fi diff --git a/os-prober.changes b/os-prober.changes index a1f65aa..712fde8 100644 --- a/os-prober.changes +++ b/os-prober.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 31 07:08:10 UTC 2018 - mchang@suse.com + +- Fix missing grub-probe command that caused linux-boot-probe to abort + prematurely. It is a mistake while rebasing patch to 1.76 (bsc#1113615) + * os-prober-1.49-grub2-mount.patch + ------------------------------------------------------------------- Mon Oct 8 10:01:45 UTC 2018 - mchang@suse.com