lib/system: Add vgscan, vgchange utilities

[petitboot] / discover / platform-powerpc.c

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index e5c83a07e1c46039f2fcdf0fca7c3ce778d678a5..a4b955ef6fd48e3c2daa72cf2696b4e6f9f8159d 100644 (file)
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -755,21 +755,8 @@ static void set_ipmi_bootdev(struct config *config, enum ipmi_bootdev bootdev,
        config->ipmi_bootdev = bootdev;
        config->ipmi_bootdev_persistent = persistent;
 
-       switch (bootdev) {
-       case IPMI_BOOTDEV_NONE:
-       case IPMI_BOOTDEV_DISK:
-       case IPMI_BOOTDEV_NETWORK:
-       case IPMI_BOOTDEV_CDROM:
-       default:
-               break;
-       case IPMI_BOOTDEV_SETUP:
-               config->autoboot_enabled = false;
-               break;
-       case IPMI_BOOTDEV_SAFE:
-               config->autoboot_enabled = false;
+       if (bootdev == IPMI_BOOTDEV_SAFE)
                config->safe_mode = true;
-               break;
-       }
 }
 
 static int read_bootdev_sysparam(const char *name, uint8_t *val)
@@ -1046,7 +1033,6 @@ static void get_ipmi_bmc_versions(struct platform *p, struct system_info *info)
        struct platform_powerpc *platform = p->platform_data;
        uint16_t resp_len = 16;
        uint8_t resp[16], bcd;
-       uint32_t aux_version;
        int i, rc;
 
        /* Retrieve info from current side */
@@ -1064,7 +1050,7 @@ static void get_ipmi_bmc_versions(struct platform *p, struct system_info *info)
                pb_debug("\n");
        }
 
-       if (rc == 0 && resp_len == 16) {
+       if (rc == 0 && (resp_len == 12 || resp_len == 16)) {
                info->bmc_current = talloc_array(info, char *, 4);
                info->n_bmc_current = 4;
 
@@ -1074,10 +1060,16 @@ static void get_ipmi_bmc_versions(struct platform *p, struct system_info *info)
                                                resp[2]);
                bcd = resp[4] & 0x0f;
                bcd += 10 * (resp[4] >> 4);
-               memcpy(&aux_version, &resp[12], sizeof(aux_version));
+               /* rev1.rev2.aux_revision */
                info->bmc_current[2] = talloc_asprintf(info,
-                                               "Firmware version: %u.%02u.%05u",
-                                               resp[3], bcd, aux_version);
+                               "Firmware version: %u.%02u",
+                               resp[3], bcd);
+               if (resp_len == 16) {
+                       info->bmc_current[2] = talloc_asprintf_append(
+                                       info->bmc_current[2],
+                                       ".%02x%02x%02x%02x",
+                                       resp[12], resp[13], resp[14], resp[15]);
+               }
                bcd = resp[5] & 0x0f;
                bcd += 10 * (resp[5] >> 4);
                info->bmc_current[3] = talloc_asprintf(info, "IPMI version: %u",
@@ -1102,7 +1094,7 @@ static void get_ipmi_bmc_versions(struct platform *p, struct system_info *info)
                pb_debug("\n");
        }
 
-       if (rc == 0 && resp_len == 16) {
+       if (rc == 0 && (resp_len == 12 || resp_len == 16)) {
                info->bmc_golden = talloc_array(info, char *, 4);
                info->n_bmc_golden = 4;
 
@@ -1112,10 +1104,16 @@ static void get_ipmi_bmc_versions(struct platform *p, struct system_info *info)
                                                resp[2]);
                bcd = resp[4] & 0x0f;
                bcd += 10 * (resp[4] >> 4);
-               memcpy(&aux_version, &resp[12], sizeof(aux_version));
+               /* rev1.rev2.aux_revision */
                info->bmc_golden[2] = talloc_asprintf(info,
-                                               "Firmware version: %u.%02u.%u",
-                                               resp[3], bcd, aux_version);
+                               "Firmware version: %u.%02u",
+                               resp[3], bcd);
+               if (resp_len == 16) {
+                       info->bmc_golden[2] = talloc_asprintf_append(
+                                       info->bmc_golden[2],
+                                       ".%02x%02x%02x%02x",
+                                       resp[12], resp[13], resp[14], resp[15]);
+               }
                bcd = resp[5] & 0x0f;
                bcd += 10 * (resp[5] >> 4);
                info->bmc_golden[3] = talloc_asprintf(info, "IPMI version: %u",
@@ -1267,7 +1265,7 @@ static int load_config(struct platform *p, struct config *config)
 
        rc = parse_nvram(platform);
        if (rc)
-               return rc;
+               pb_log("%s: Failed to parse nvram\n", __func__);
 
        populate_config(platform, config);