pool/os-prober
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 640741 from home:michael-chang:os-prober-1.76

Browse Source 
- Version bump to 1.76:
  * Fix check on ID_PART_ENTRY_SCHEME, to look for "dos" instead of "msdos"
  * Remove code using device mapper
  * This also removes the dependency on dmsetup
- Rediff
  * os-prober-1.49-grub2-mount.patch
  * os-prober-accept-ESP-on-IMSM.patch
  * os-prober-dont-load-all-fs-module-and-dont-test-mount.patch
  * os-prober-fix-btrfs-subvol-mounted-tests.patch

OBS-URL: https://build.opensuse.org/request/show/640741
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=87
This commit is contained in:
Andrei Borzenkov
2018-10-10 17:52:55 +00:00
committed by Git OBS Bridge
parent 815da4652d
commit 291be643b3
8 changed files with 61 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
os-prober-1.49-grub2-mount.patch
View File

@@ -1,8 +1,8 @@
Index: os-prober/common.sh
Index: os-prober-1.76/common.sh
===================================================================
--- os-prober.orig/common.sh
+++ os-prober/common.sh
@@ -302,8 +302,8 @@ linux_mount_boot () {
--- 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"
@@ -11,16 +11,16 @@ Index: os-prober/common.sh
+ if type grub2-mount >/dev/null 2>&1 && \
+ grub2-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then
mounted=1
elif dm_device="$(do_dmsetup osprober-linux "$boottomnt")" && [ "$dm_device" ]; then
if mountinfo=`mount -o ro "$dm_device" "$tmpmnt/boot" -t "$3"`; then
Index: os-prober/linux-boot-probes/common/50mounted-tests
fi
fi
Index: os-prober-1.76/linux-boot-probes/common/50mounted-tests
===================================================================
--- os-prober.orig/linux-boot-probes/common/50mounted-tests
+++ os-prober/linux-boot-probes/common/50mounted-tests
@@ -55,11 +55,11 @@ fi
--- 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
fi
mounted=
dm_devices=
-if type grub-mount >/dev/null 2>&1 && \
- type grub-probe >/dev/null 2>&1 && \
- grub-mount "$partition" "$tmpmnt" 2>/dev/null; then
@@ -28,16 +28,16 @@ Index: os-prober/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
elif dm_device="$(do_dmsetup osprober-linux "$partition")" && \
[ "$dm_device" ]; then
Index: os-prober/os-probes/common/50mounted-tests
fi
Index: os-prober-1.76/os-probes/common/50mounted-tests
===================================================================
--- os-prober.orig/os-probes/common/50mounted-tests
+++ os-prober/os-probes/common/50mounted-tests
@@ -66,11 +66,11 @@ if [ ! -d "$tmpmnt" ]; then
--- 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=
@@ -53,10 +53,10 @@ Index: os-prober/os-probes/common/50mounted-tests
if [ "$type" ]; then
debug "mounted using GRUB $type filesystem driver"
else
Index: os-prober/os-probes/init/common/10filesystems
Index: os-prober-1.76/os-probes/init/common/10filesystems
===================================================================
--- os-prober.orig/os-probes/init/common/10filesystems
+++ os-prober/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