rpm/os-prober
SHA256
1
0
Fork 0
forked from pool/os-prober
Code Pull Requests Activity

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

Browse Source 
- Handle /etc/os-release symlink (bsc#997465)
  * refresh os-prober-linux-distro-parse-os-release.patch

OBS-URL: https://build.opensuse.org/request/show/433076
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=69
This commit is contained in:
Andrei Borzenkov 2016-10-04 11:56:26 +00:00 committed by Git OBS Bridge
parent 1b693631e1
commit 2ebd2e5419
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
os-prober-linux-distro-parse-os-release.patch
View File

@ -2,10 +2,21 @@ 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.orig/os-probes/mounted/common/90linux-distro
+++ os-prober-1.70/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 elif [ -e "$dir/etc/meego-release" ]; then
short="MeeGo" short="MeeGo"
long="$(head -1 "$dir/etc/meego-release")" 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 +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) + 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)" + long="$short $(sed -n "/^VERSION=/{s@\"\(.*\)\"@\1@;t 1;s@'\(.*\)'@\1@;: 1;s@^[^=]\+=@@;p;b}" $dir/etc/os-release)"

6
os-prober.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 4 08:28:26 UTC 2016 - mchang@suse.com
- Handle /etc/os-release symlink (bsc#997465)
* refresh os-prober-linux-distro-parse-os-release.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 14 04:46:42 UTC 2016 - mchang@suse.com Wed Sep 14 04:46:42 UTC 2016 - mchang@suse.com