Hello community,
here is the log from the commit of package os-prober for openSUSE:Factory
checked in at 2016-09-27 13:41:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-12-27
01:57:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2016-09-27
13:41:48.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Sep 14 04:46:42 UTC 2016 - mch...@suse.com
+
+- Parse /etc/os-release for openSUSE Tumbleweed (bsc#997465)
+ * os-prober-linux-distro-parse-os-release.patch
+
+-------------------------------------------------------------------
New:
----
os-prober-linux-distro-parse-os-release.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ os-prober.spec ++++++
--- /var/tmp/diff_new_pack.AwvzW4/_old 2016-09-27 13:41:49.000000000 +0200
+++ /var/tmp/diff_new_pack.AwvzW4/_new 2016-09-27 13:41:49.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package os-prober
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -66,6 +66,8 @@
Patch22: os-prober-btrfs-always-detect-default.patch
# PATCH-FIX-OPENSUSE: y2base runs at 100% cpu busy from beginning in
installation of files to completion (bsc#953987)
Patch23: os-prober-linux-distro-avoid-expensive-ld-file-test.patch
+# PATCH-FIX-OPENSUSE: Leap does not recognize Tumbleweed any more (bsc#997465)
+Patch24: os-prober-linux-distro-parse-os-release.patch
Requires: /bin/grep
Requires: /bin/sed
Requires: /sbin/modprobe
@@ -108,6 +110,7 @@
%patch21 -p1
%patch22 -p1
%patch23 -p1
+%patch24 -p1
find . -name \*.orig -delete
%build
++++++ os-prober-linux-distro-parse-os-release.patch ++++++
Index: os-prober-1.70/os-probes/mounted/common/90linux-distro
===================================================================
--- 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
elif [ -e "$dir/etc/meego-release" ]; then
short="MeeGo"
long="$(head -1 "$dir/etc/meego-release")"
+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)"
# This test is inaccurate, but given separate / and /boot partitions and the
# fact that only some architectures have ld-linux.so, I can't see anything
# better. Make sure this test has a high number so that more accurate tests
