Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/23802 )
Change subject: dmi: Don't print dmidecode shell error ......................................................................
dmi: Don't print dmidecode shell error
Don't print the error "sh: dmidecode: not found" if dmidecode is not there. Uses stderr redirection to /dev/null (or NUL on Windows).
Change-Id: I3ded8e1bad14b5e809185a79c4e3a17329b1ecb9 Signed-off-by: Stefan Reinauer stefan.reinauer@coreboot.org Signed-off-by: Stefan Tauner stefan.tauner@student.tuwien.ac.at Signed-off-by: Nico Huber nico.h@gmx.de Reviewed-on: https://review.coreboot.org/23802 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net --- M dmi.c 1 file changed, 6 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Stefan Reinauer: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve
diff --git a/dmi.c b/dmi.c index 729cdb1..70b1177 100644 --- a/dmi.c +++ b/dmi.c @@ -34,6 +34,7 @@ #include <stdio.h> #include <stdlib.h>
+#include "platform.h" #include "flash.h" #include "programmer.h"
@@ -292,7 +293,11 @@ #else /* CONFIG_INTERNAL_DMI */
#define DMI_COMMAND_LEN_MAX 300 -static const char *dmidecode_command = "dmidecode"; +#if IS_WINDOWS +static const char *dmidecode_command = "dmidecode.exe 2>NUL"; +#else +static const char *dmidecode_command = "dmidecode 2>/dev/null"; +#endif
static char *get_dmi_string(const char *string_name) {