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
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
Index: os-prober/os-probes/mounted/common/90linux-distro
|
|
===================================================================
|
|
--- os-prober.orig/os-probes/mounted/common/90linux-distro
|
|
+++ os-prober/os-probes/mounted/common/90linux-distro
|
|
@@ -10,7 +10,18 @@ type="$3"
|
|
uuid="$4"
|
|
subvol="$5"
|
|
|
|
-if [ -e "$dir/etc/os-release" ]; then
|
|
+if [ -L "$dir/etc/os-release" ]; then
|
|
+ RELPATH=$(readlink -f "$dir/etc/os-release")
|
|
+ if readlink "$dir/etc/os-release" | grep -q '^/'; then
|
|
+ RELPATH="$dir$RELPATH"
|
|
+ fi
|
|
+ if [ -f "$RELPATH" ]; then
|
|
+ short="$(grep ^NAME= "$RELPATH" | sed 's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g; s/[[:space:]].*//')"
|
|
+ long="$(grep ^PRETTY_NAME= "$RELPATH" | sed 's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g')"
|
|
+ else
|
|
+ exit 1
|
|
+ fi
|
|
+elif [ -e "$dir/etc/os-release" ]; then
|
|
short="$(grep ^NAME= "$dir/etc/os-release" | sed 's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g; s/[[:space:]].*//')"
|
|
long="$(grep ^PRETTY_NAME= "$dir/etc/os-release" | sed 's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g')"
|
|
elif [ -e "$dir/etc/debian_version" ]; then
|