From ed5091b16f9530364b64772343cf15ff9236443c Mon Sep 17 00:00:00 2001 From: Pawel Wieczorkiewicz Date: Sat, 10 Aug 2019 13:46:47 +0000 Subject: [PATCH] kpatch-build: Check if /etc/os-release exists Not every distro out there supports /etc/os-release file. This file is useful for obtaining given distro defaults, but not essential for the script to work (when all parameters are passed on a command line). To avoid warnings or unwanted errors, make sourcing of this file conditional. Signed-off-by: Pawel Wieczorkiewicz --- kpatch-build/kpatch-build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build index 02aa4ec..e695eea 100755 --- a/kpatch-build/kpatch-build +++ b/kpatch-build/kpatch-build @@ -46,6 +46,7 @@ RPMTOPDIR="$CACHEDIR/buildroot" VERSIONFILE="$CACHEDIR/version" TEMPDIR="$CACHEDIR/tmp" LOGFILE="$CACHEDIR/build.log" +RELEASE_FILE=/etc/os-release DEBUG=0 SKIPCLEANUP=0 SKIPGCCCHECK=0 @@ -569,8 +570,8 @@ fi [[ -z "$TARGETS" ]] && TARGETS="vmlinux modules" # Don't check external file. -# shellcheck disable=SC1091 -source /etc/os-release +# shellcheck disable=SC1090 +[[ -f "$RELEASE_FILE" ]] && source "$RELEASE_FILE" DISTRO="$ID" if [[ "$DISTRO" = fedora ]] || [[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = ol ]] || [[ "$DISTRO" = centos ]]; then [[ -z "$VMLINUX" ]] && VMLINUX="/usr/lib/debug/lib/modules/$ARCHVERSION/vmlinux"