From: Daniel Molkentin Date: Thu, 17 Oct 2019 14:08:26 +0000 (+0200) Subject: 99base: Do not hardcode ANSI_COLOR X-Git-Tag: 050~145 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e9b094b21de2ce771f7bff793d6f972f284ce09;p=thirdparty%2Fdracut.git 99base: Do not hardcode ANSI_COLOR Take it from /etc/os-release instead, as distributions usually customize this setting, but keep it as default value. --- diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh index 97c2d83e9..f5a2e030d 100755 --- a/modules.d/99base/module-setup.sh +++ b/modules.d/99base/module-setup.sh @@ -69,17 +69,19 @@ install() { local VERSION="" local PRETTY_NAME="" + # default values + ANSI_COLOR="0;34" if [ -e /etc/os-release ]; then . /etc/os-release [[ -n ${VERSION} ]] && VERSION+=" " [[ -n ${PRETTY_NAME} ]] && PRETTY_NAME+=" " fi + # force-override values NAME=dracut ID=dracut VERSION+="dracut-$DRACUT_VERSION" PRETTY_NAME+="dracut-$DRACUT_VERSION (Initramfs)" VERSION_ID=$DRACUT_VERSION - ANSI_COLOR="0;34" [ -e "${initdir}/usr/lib" ] || mkdir -m 0755 -p ${initdir}/usr/lib {