Attachment 1275928 Details for Bug 1447420 – Use systemd resources to detect if available

[patch] Use systemd resources to detect if available

use-os-release-for-dist.patch (text/plain), 2.11 KB, created by Pat Riehecky on 2017-05-03 15:06:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pat Riehecky

Created: 2017-05-03 15:06:10 UTC

Size: 2.11 KB

patch

obsolete

>diff --git a/dist.sh b/dist.sh
>index db6c053..328ed40 100644
>--- a/dist.sh
>+++ b/dist.sh
>@@ -12,10 +12,16 @@
> # dist tag. Otherwise, we exit with no output.
> 
> RELEASEFILE=/etc/redhat-release
>+SYSTEMRELEASEFILE=/etc/os-release
>+DEFAULTSYSTEMRELEASEFILE=/usr/lib/os-release
> 
> function check_num {
>-    MAINVER=`cut -d "(" -f 1 < $RELEASEFILE | \
>-	sed -e "s/[^0-9.]//g" -e "s/$//g" | cut -d "." -f 1`
>+    if [[ -z ${VERSION_ID} ]]; then
>+        MAINVER=`cut -d "(" -f 1 < $RELEASEFILE | \
>+	    sed -e "s/[^0-9.]//g" -e "s/$//g" | cut -d "." -f 1`
>+    else
>+        MAINVER=`echo ${VERSION_ID}| cut -d "." -f 1`
>+    fi
> 
>     echo $MAINVER | grep -q '[0-9]' && echo $MAINVER
> }
>@@ -25,22 +31,47 @@ function check_rhl {
> }
> 
> function check_rhel {
>-    egrep -q "(Enterprise|Advanced)" $RELEASEFILE && echo $DISTNUM
>+    if [[ -z ${ID} ]]; then
>+        egrep -q "(Enterprise|Advanced)" $RELEASEFILE && echo $DISTNUM
>+    else
>+        for POSSIBLE_ID in ${ID} ${ID_LIKE}; do
>+            if [[ "${POSSIBLE_ID}" == 'rhel' ]]; then
>+                echo $DISTNUM
>+            fi
>+        done
>+    fi
> }
> 
> function check_fedora {
>-    grep -q Fedora $RELEASEFILE && echo $DISTNUM
>+    if [[ -z ${ID} ]]; then
>+        grep -q Fedora $RELEASEFILE && echo $DISTNUM
>+    else
>+        for POSSIBLE_ID in ${ID} ${ID_LIKE}; do
>+            if [[ "${POSSIBLE_ID}" == 'fedora' ]]; then
>+                echo $DISTNUM
>+            fi
>+        done
>+    fi
> }
> 
>+# /usr/lib/os-release is expected on systemd, shipped by OS vendor
>+if [[ -e ${DEFAULTSYSTEMRELEASEFILE} ]] ; then
>+    source ${DEFAULTSYSTEMRELEASEFILE}
>+fi
>+# /etc/os-release is expected on systemd, may override or replace /usr/lib/os-release entries
>+if [[ -e ${SYSTEMRELEASEFILE} ]] ; then
>+    source ${SYSTEMRELEASEFILE}
>+fi
>+
> DISTNUM=`check_num`
> DISTFC=`check_fedora`
>-DISTRHL=`check_rhl`
> DISTRHEL=`check_rhel`
>+DISTRHL=`check_rhl`
> if [ -n "$DISTNUM" ]; then
>-    if [ -n "$DISTFC" ]; then
>-	DISTTYPE=fc
>-    elif [ -n "$DISTRHEL" ]; then
>+    if [ -n "$DISTRHEL" ]; then
> 	DISTTYPE=el
>+    elif [ -n "$DISTFC" ]; then
>+	DISTTYPE=fc
>     elif [ -n "$DISTRHL" ]; then
> 	DISTTYPE=rhl
>     fi

Actions: View | Diff

Attachments on bug 1447420: 1275724 | 1275928