192dc7fe8f
- 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
69 lines
2.7 KiB
Diff
69 lines
2.7 KiB
Diff
Index: os-prober-1.76/common.sh
|
|
===================================================================
|
|
--- os-prober-1.76.orig/common.sh
|
|
+++ os-prober-1.76/common.sh
|
|
@@ -279,8 +279,8 @@ linux_mount_boot () {
|
|
debug "found boot partition $1 for linux system on $partition, but cannot map to existing device"
|
|
else
|
|
debug "found boot partition $bootpart for linux system on $partition"
|
|
- if type grub-mount >/dev/null 2>&1 && \
|
|
- grub-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then
|
|
+ if type grub2-mount >/dev/null 2>&1 && \
|
|
+ grub2-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then
|
|
mounted=1
|
|
fi
|
|
fi
|
|
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,11 @@ if [ ! -d "$tmpmnt" ]; then
|
|
fi
|
|
|
|
mounted=
|
|
-if type grub-mount >/dev/null 2>&1 && \
|
|
- type grub-probe >/dev/null 2>&1 && \
|
|
- grub-mount "$partition" "$tmpmnt" 2>/dev/null; then
|
|
+if type grub2-mount >/dev/null 2>&1 && \
|
|
+ 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="$(grub2-probe -d "$partition" -t fs)"
|
|
[ "$type" ] || type=fuseblk
|
|
fi
|
|
|
|
Index: os-prober-1.76/os-probes/common/50mounted-tests
|
|
===================================================================
|
|
--- os-prober-1.76.orig/os-probes/common/50mounted-tests
|
|
+++ os-prober-1.76/os-probes/common/50mounted-tests
|
|
@@ -58,11 +58,11 @@ if [ ! -d "$tmpmnt" ]; then
|
|
fi
|
|
|
|
mounted=
|
|
-if type grub-mount >/dev/null 2>&1 && \
|
|
- type grub-probe >/dev/null 2>&1 && \
|
|
- grub-mount "$partition" "$tmpmnt" 2>/dev/null; then
|
|
+if type grub2-mount >/dev/null 2>&1 && \
|
|
+ type grub2-probe >/dev/null 2>&1 && \
|
|
+ grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then
|
|
mounted=1
|
|
- type="$(grub-probe -d "$partition" -t fs)" || true
|
|
+ type="$(grub2-probe -d "$partition" -t fs)" || true
|
|
if [ "$type" ]; then
|
|
debug "mounted using GRUB $type filesystem driver"
|
|
else
|
|
Index: os-prober-1.76/os-probes/init/common/10filesystems
|
|
===================================================================
|
|
--- os-prober-1.76.orig/os-probes/init/common/10filesystems
|
|
+++ os-prober-1.76/os-probes/init/common/10filesystems
|
|
@@ -3,7 +3,7 @@
|
|
set +e # ignore errors from modprobe
|
|
|
|
FILESYSTEMS='ext2 ext3 ext4 xfs jfs msdos vfat ntfs minix hfs hfsplus qnx4 ufs btrfs'
|
|
-# fuse is needed to make grub-mount work.
|
|
+# fuse is needed to make grub2-mount work.
|
|
FILESYSTEMS="$FILESYSTEMS fuse"
|
|
# The Ubuntu kernel udebs put a number of filesystem modules in
|
|
# fs-{core,secondary}-modules. It's fairly cheap to check for these too.
|