From: Juan RP Date: Wed, 6 Jun 2012 12:19:59 +0000 (+0200) Subject: Avoid annonying warnings when pkg-config is not installed. X-Git-Tag: 020~112 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2cf4f4fb747803ff31d53507bc047232c4ef99ea;p=thirdparty%2Fdracut.git Avoid annonying warnings when pkg-config is not installed. --- diff --git a/dracut-functions.sh b/dracut-functions.sh index f78887817..4180f03a4 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -531,7 +531,7 @@ inst_symlink() { ln -sfn $(convert_abs_rel "${_target}" "${_realsrc}") "$initdir/$_target" } -udevdir=$(pkg-config udev --variable=udevdir) +udevdir=$(pkg-config udev --variable=udevdir 2>/dev/null) if ! [[ -d "$udevdir" ]]; then [[ -d /lib/udev ]] && udevdir=/lib/udev [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh index e8c1c04d6..ff4702105 100755 --- a/modules.d/95udev-rules/module-setup.sh +++ b/modules.d/95udev-rules/module-setup.sh @@ -5,13 +5,13 @@ install() { local _i - systemdutildir=$(pkg-config systemd --variable=systemdutildir) + systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null) if ! [[ -d "$systemdutildir" ]]; then [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd fi - udevdir=$(pkg-config udev --variable=udevdir) + udevdir=$(pkg-config udev --variable=udevdir 2>/dev/null) if ! [[ -d "$udevdir" ]]; then [[ -d /lib/udev ]] && udevdir=/lib/udev [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev