Skip to content

Commit

Permalink
fix(plymouth): hide dpkg-architecture stderr messages
Browse files Browse the repository at this point in the history
dpkg-architecture prints warnings and errors to stderr. If the system does
not have gcc installed, it issues a warning:

dpkg-architecture: warning: cannot determine CC system type, falling back to default (native compilation)

This fix checks only the value of the queried variable.
  • Loading branch information
aafeijoo-suse authored and johannbg committed Mar 27, 2022
1 parent 7011229 commit 42e9d18
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion modules.d/50plymouth/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
pkglib_dir() {
local _dirs="/usr/lib/plymouth /usr/libexec/plymouth/"
if find_binary dpkg-architecture &> /dev/null; then
_dirs+=" /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
local _arch
_arch=$(dpkg-architecture -qDEB_HOST_MULTIARCH 2> /dev/null)
[ -n "$_arch" ] && _dirs+=" /usr/lib/$_arch/plymouth"
fi
for _dir in $_dirs; do
if [ -x "$dracutsysrootdir""$_dir"/plymouth-populate-initrd ]; then
Expand Down

0 comments on commit 42e9d18

Please sign in to comment.