SHA256
1
0
forked from pool/os-prober
os-prober/os-prober-linux-distro-parse-os-release.patch
Michael Chang 2c62f81481 Accepting request 1044146 from home:michael-chang:branches:Base:System
- update to 1.81
- use %autosetup macro to unpack source and apply patch
- drop patch for upstream
  * os-prober-multiple-initrd.patch
- rediff
  * Improve-btrfs-handling-on-os-probing-for-grub2.patch
  * os-prober-linux-distro-avoid-expensive-ld-file-test.patch
  * os-prober-linux-distro-parse-os-release.patch
  * os-prober-linux-secure-boot.patch

OBS-URL: https://build.opensuse.org/request/show/1044146
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=107
2023-01-03 02:35:40 +00:00

27 lines
1.1 KiB
Diff

---
os-probes/mounted/common/90linux-distro | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
--- a/os-probes/mounted/common/90linux-distro
+++ b/os-probes/mounted/common/90linux-distro
@@ -10,7 +10,18 @@
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/usr/lib/os-release" ]; then