discover: Update env vars at init and suppress LVM warnings

[petitboot] / discover / platform-powerpc.c

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 247b4e6d9389956916e63a27fc709d6bb7aa85f7..02d9a207e707463424bb855fb20823f03bc0acc5 100644 (file)
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -410,11 +410,9 @@ static int read_bootdev(void *ctx, char **pos, struct autoboot_option *opt)
        if (!strncmp(*pos, "uuid:", strlen("uuid:"))) {
                prefix = strlen("uuid:");
                opt->boot_type = BOOT_DEVICE_UUID;
-               rc = 0;
        } else if (!strncmp(*pos, "mac:", strlen("mac:"))) {
                prefix = strlen("mac:");
                opt->boot_type = BOOT_DEVICE_UUID;
-               rc = 0;
        } else {
                type = find_device_type(*pos);
                if (type != DEVICE_TYPE_UNKNOWN) {
@@ -428,9 +426,12 @@ static int read_bootdev(void *ctx, char **pos, struct autoboot_option *opt)
                if (delim)
                        len = (int)(delim - *pos) - prefix;
                else
-                       len = strlen(*pos);
+                       len = strlen(*pos) - prefix;
 
-               opt->uuid = talloc_strndup(ctx, *pos + prefix, len);
+               if (len) {
+                       opt->uuid = talloc_strndup(ctx, *pos + prefix, len);
+                       rc = 0;
+               }
        }
 
        /* Always advance pointer to next option or end */
@@ -491,19 +492,6 @@ static void populate_bootdev_config(struct platform_powerpc *platform,
        config->n_autoboot_opts = n_new;
 }
 
-static void set_proxy_variables(struct config *config)
-{
-       if (config->http_proxy)
-               setenv("http_proxy", config->http_proxy, 1);
-       else
-               unsetenv("http_proxy");
-
-       if (config->https_proxy)
-               setenv("https_proxy", config->https_proxy, 1);
-       else
-               unsetenv("https_proxy");
-}
-
 static void populate_config(struct platform_powerpc *platform,
                struct config *config)
 {
@@ -559,7 +547,6 @@ static void populate_config(struct platform_powerpc *platform,
        val = get_param(platform, "petitboot,https_proxy");
        if (val)
                config->https_proxy = talloc_strdup(config, val);
-       set_proxy_variables(config);
 }
 
 static char *iface_config_str(void *ctx, struct interface_config *config)
@@ -739,7 +726,6 @@ static int update_config(struct platform_powerpc *platform,
        update_string_config(platform, "petitboot,http_proxy", val);
        val = config->https_proxy ?: "";
        update_string_config(platform, "petitboot,https_proxy", val);
-       set_proxy_variables(config);
 
        update_network_config(platform, config);
 
@@ -754,21 +740,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)
@@ -1045,7 +1018,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 */
@@ -1063,7 +1035,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;
 
@@ -1073,10 +1045,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",
@@ -1101,7 +1079,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;
 
@@ -1111,10 +1089,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",
@@ -1266,7 +1250,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);