Hello community,
here is the log from the commit of package os-prober for openSUSE:Factory
checked in at 2016-10-06 12:30:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
and /work/SRC/openSUSE:Factory/.os-prober.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober"
Changes:
--------
--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2016-09-27
13:41:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2016-10-06
12:30:46.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Oct 4 08:28:26 UTC 2016 - mch...@suse.com
+
+- Handle /etc/os-release symlink (bsc#997465)
+ * refresh os-prober-linux-distro-parse-os-release.patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ os-prober-linux-distro-parse-os-release.patch ++++++
--- /var/tmp/diff_new_pack.RhVjK2/_old 2016-10-06 12:30:47.000000000 +0200
+++ /var/tmp/diff_new_pack.RhVjK2/_new 2016-10-06 12:30:47.000000000 +0200
@@ -2,10 +2,21 @@
===================================================================
--- os-prober-1.70.orig/os-probes/mounted/common/90linux-distro
+++ os-prober-1.70/os-probes/mounted/common/90linux-distro
-@@ -117,6 +117,9 @@ elif [ -e "$dir/etc/lfs-release" ]; then
+@@ -117,6 +117,20 @@ elif [ -e "$dir/etc/lfs-release" ]; then
elif [ -e "$dir/etc/meego-release" ]; then
short="MeeGo"
long="$(head -1 "$dir/etc/meego-release")"
++elif [ -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=$(sed -n "/^NAME=/{s@\"\(.*\)\"@\1@;t 1;s@'\(.*\)'@\1@;:
1;s@^[^=]\+=@@;p;b}" "$RELPATH")
++ long="$short $(sed -n "/^VERSION=/{s@\"\(.*\)\"@\1@;t
1;s@'\(.*\)'@\1@;: 1;s@^[^=]\+=@@;p;b}" "$RELPATH")"
++ else
++ exit 1
++ fi
+elif [ -e "$dir/etc/os-release" ]; then
+ short=$(sed -n "/^NAME=/{s@\"\(.*\)\"@\1@;t 1;s@'\(.*\)'@\1@;:
1;s@^[^=]\+=@@;p;b}" $dir/etc/os-release)
+ long="$short $(sed -n "/^VERSION=/{s@\"\(.*\)\"@\1@;t
1;s@'\(.*\)'@\1@;: 1;s@^[^=]\+=@@;p;b}" $dir/etc/os-release)"
