2018-10-10 19:52:55 +02:00
|
|
|
Index: os-prober-1.76/common.sh
|
2017-02-20 12:06:06 +01:00
|
|
|
===================================================================
|
2018-10-10 19:52:55 +02:00
|
|
|
--- os-prober-1.76.orig/common.sh
|
|
|
|
+++ os-prober-1.76/common.sh
|
|
|
|
@@ -279,8 +279,8 @@ linux_mount_boot () {
|
2013-01-22 05:50:36 +01:00
|
|
|
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"
|
2013-06-19 04:22:25 +02:00
|
|
|
- if type grub-mount >/dev/null 2>&1 && \
|
2013-01-22 05:50:36 +01:00
|
|
|
- grub-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then
|
2013-06-19 04:22:25 +02:00
|
|
|
+ if type grub2-mount >/dev/null 2>&1 && \
|
2013-01-22 05:50:36 +01:00
|
|
|
+ grub2-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then
|
|
|
|
mounted=1
|
2018-10-10 19:52:55 +02:00
|
|
|
fi
|
|
|
|
fi
|
|
|
|
Index: os-prober-1.76/linux-boot-probes/common/50mounted-tests
|
2017-02-20 12:06:06 +01:00
|
|
|
===================================================================
|
2018-10-10 19:52:55 +02:00
|
|
|
--- os-prober-1.76.orig/linux-boot-probes/common/50mounted-tests
|
|
|
|
+++ os-prober-1.76/linux-boot-probes/common/50mounted-tests
|
2018-11-01 08:00:14 +01:00
|
|
|
@@ -48,11 +48,11 @@ if [ ! -d "$tmpmnt" ]; then
|
2018-10-10 19:52:55 +02:00
|
|
|
fi
|
2013-01-22 05:50:36 +01:00
|
|
|
|
|
|
|
mounted=
|
2013-06-19 04:22:25 +02:00
|
|
|
-if type grub-mount >/dev/null 2>&1 && \
|
|
|
|
- type grub-probe >/dev/null 2>&1 && \
|
2013-01-22 05:50:36 +01:00
|
|
|
- grub-mount "$partition" "$tmpmnt" 2>/dev/null; then
|
2013-06-19 04:22:25 +02:00
|
|
|
+if type grub2-mount >/dev/null 2>&1 && \
|
|
|
|
+ type grub2-probe >/dev/null 2>&1 && \
|
2013-01-22 05:50:36 +01:00
|
|
|
+ grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then
|
|
|
|
mounted=1
|
2018-11-01 08:00:14 +01:00
|
|
|
- type="$(grub-probe -d "$partition" -t fs)"
|
2013-06-19 04:22:25 +02:00
|
|
|
+ type="$(grub2-probe -d "$partition" -t fs)"
|
|
|
|
[ "$type" ] || type=fuseblk
|
2018-10-10 19:52:55 +02:00
|
|
|
fi
|
|
|
|
|
|
|
|
Index: os-prober-1.76/os-probes/common/50mounted-tests
|
2017-02-20 12:06:06 +01:00
|
|
|
===================================================================
|
2018-10-10 19:52:55 +02:00
|
|
|
--- 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
|
2013-01-22 05:50:36 +01:00
|
|
|
fi
|
|
|
|
|
|
|
|
mounted=
|
2013-06-19 04:22:25 +02:00
|
|
|
-if type grub-mount >/dev/null 2>&1 && \
|
|
|
|
- type grub-probe >/dev/null 2>&1 && \
|
2013-01-22 05:50:36 +01:00
|
|
|
- grub-mount "$partition" "$tmpmnt" 2>/dev/null; then
|
2013-06-19 04:22:25 +02:00
|
|
|
+if type grub2-mount >/dev/null 2>&1 && \
|
|
|
|
+ type grub2-probe >/dev/null 2>&1 && \
|
2013-01-22 05:50:36 +01:00
|
|
|
+ grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then
|
|
|
|
mounted=1
|
2013-06-19 04:22:25 +02:00
|
|
|
- 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
|
2018-10-10 19:52:55 +02:00
|
|
|
Index: os-prober-1.76/os-probes/init/common/10filesystems
|
2017-02-20 12:06:06 +01:00
|
|
|
===================================================================
|
2018-10-10 19:52:55 +02:00
|
|
|
--- os-prober-1.76.orig/os-probes/init/common/10filesystems
|
|
|
|
+++ os-prober-1.76/os-probes/init/common/10filesystems
|
2014-12-18 15:15:54 +01:00
|
|
|
@@ -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.
|