hooks/set-stdout: move hook to after automatic stdout settings

[petitboot] / discover / platform-powerpc.c

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index eb54c6dddf231d73a5f1f1965f76703f7967d471..8fca5bd4bdb60da2dce3990696b283ab9d5648f8 100644 (file)
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -1348,6 +1348,7 @@ static bool probe(struct platform *p, void *ctx)
 {
        struct platform_powerpc *platform;
        struct stat statbuf;
+       bool bmc_present;
        int rc;
 
        /* we need a device tree */
@@ -1363,7 +1364,9 @@ static bool probe(struct platform *p, void *ctx)
 
        p->platform_data = platform;
 
-       if (ipmi_present()) {
+       bmc_present = stat("/proc/device-tree/bmc", &statbuf) == 0;
+
+       if (ipmi_present() && bmc_present) {
                pb_debug("platform: using direct IPMI for IPMI paramters\n");
                platform->ipmi = ipmi_open(platform);
                platform->get_ipmi_bootdev = get_ipmi_bootdev_ipmi;
@@ -1378,8 +1381,7 @@ static bool probe(struct platform *p, void *ctx)
                pb_log("platform: no IPMI parameter support\n");
        }
 
-       rc = stat("/proc/device-tree/bmc", &statbuf);
-       if (!rc)
+       if (bmc_present)
                platform->get_platform_versions = hostboot_load_versions;
 
        return true;