Accepting request 459143 from home:michael-chang:branches:Base:System

- 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

os-prober-1.49-grub2-mount.patch

@@ -1,7 +1,8 @@
-diff -urN os-prober.old/common.sh os-prober/common.sh
---- os-prober.old/common.sh	2014-12-14 19:04:07.711368751 +0100
-+++ os-prober/common.sh	2014-12-14 19:04:29.792443896 +0100
-@@ -259,8 +259,8 @@
+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"
@@ -10,15 +11,16 @@ diff -urN os-prober.old/common.sh os-prober/common.sh
 +					if type grub2-mount >/dev/null 2>&1 && \
 +					   grub2-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then
  						mounted=1
- 					else
- 						ro_partition "$boottomnt"
-diff -urN os-prober.old/linux-boot-probes/common/50mounted-tests os-prober/linux-boot-probes/common/50mounted-tests
---- os-prober.old/linux-boot-probes/common/50mounted-tests	2014-12-14 19:04:07.711368751 +0100
-+++ os-prober/linux-boot-probes/common/50mounted-tests	2014-12-14 19:04:29.792443896 +0100
-@@ -34,11 +34,11 @@
- fi
+ 					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
@@ -29,12 +31,13 @@ diff -urN os-prober.old/linux-boot-probes/common/50mounted-tests os-prober/linux
 -	type="$(grub-probe -d "$partition" -t fs)"
 +	type="$(grub2-probe -d "$partition" -t fs)"
  	[ "$type" ] || type=fuseblk
- else
- 	ro_partition "$partition"
-diff -urN os-prober.old/os-probes/common/50mounted-tests os-prober/os-probes/common/50mounted-tests
---- os-prober.old/os-probes/common/50mounted-tests	2014-12-14 19:04:07.712368755 +0100
-+++ os-prober/os-probes/common/50mounted-tests	2014-12-14 19:04:29.793443899 +0100
-@@ -46,11 +46,11 @@
+ 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=
@@ -50,9 +53,10 @@ diff -urN os-prober.old/os-probes/common/50mounted-tests os-prober/os-probes/com
  	if [ "$type" ]; then
  		debug "mounted using GRUB $type filesystem driver"
  	else
-diff -urN os-prober.old/os-probes/init/common/10filesystems os-prober/os-probes/init/common/10filesystems
---- os-prober.old/os-probes/init/common/10filesystems	2014-12-14 19:04:07.713368758 +0100
-+++ os-prober/os-probes/init/common/10filesystems	2014-12-14 19:04:54.182526874 +0100
+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