8f472cc59a
- Version bump to 1.74:
* Add support for Mageia
* Improve logging of mounting and setting partitions to ro/rw
* Use a read-only device-mapper entry if possible rather than setting the
underlying device to read-only.
Note that this introduces a dependency on dmsetup on Linux architectures.
* Remove the "blockdev --setro" code path entirely, since the read-only
device-mapper arrangement supersedes it and should be safer
* Make the yaboot parser more tolerant about the syntax of "append" options
* Disable debugging if OS_PROBER_DISABLE_DEBUG is set
* Replace basename/dirname with shell string processing
* Fix typos in README
* Add Devuan detection
* Work harder to avoid trying to mount extended partitions
* Drop " (loader)" suffixes on Microsoft operating systems
* Add support for 4MLinux
* Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb.
- Rediff
* os-prober-1.49-grub2-mount.patch
* os-prober-EFI-openSUSEfy.patch
* os-prober-btrfs-always-detect-default.patch
* os-prober-btrfsfix.patch
* os-prober-dont-load-all-fs-module-and-dont-test-mount.patch
* os-prober-fix-btrfs-subvol-mounted-tests.patch
* os-prober-linux-distro-avoid-expensive-ld-file-test.patch
* os-prober-linux-distro-parse-os-release.patch
- Remove patches; fixed on upstream release
* os-prober-call-dmraid-once.patch
* os-prober-1.49-skip-LVM2_member.patch
OBS-URL: https://build.opensuse.org/request/show/459143
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=73
69 lines
2.9 KiB
Diff
69 lines
2.9 KiB
Diff
Index: os-prober/common.sh
|
|
===================================================================
|
|
--- os-prober.orig/common.sh
|
|
+++ os-prober/common.sh
|
|
@@ -302,8 +302,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
|
|
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
|
|
===================================================================
|
|
--- os-prober.orig/linux-boot-probes/common/50mounted-tests
|
|
+++ os-prober/linux-boot-probes/common/50mounted-tests
|
|
@@ -55,11 +55,11 @@ 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
|
|
+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
|
|
elif dm_device="$(do_dmsetup osprober-linux "$partition")" && \
|
|
[ "$dm_device" ]; then
|
|
Index: os-prober/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
|
|
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/os-probes/init/common/10filesystems
|
|
===================================================================
|
|
--- os-prober.orig/os-probes/init/common/10filesystems
|
|
+++ os-prober/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.
|