discover: Respect persistent flag for network overrides

[petitboot] / discover / ipmi.c

diff --git a/discover/ipmi.c b/discover/ipmi.c
index e52070ffe4c8a78930a519b3e7f1664923eecfa3..38423b2647319fe7a3b040adc61a293857f9c9fd 100644 (file)
--- a/discover/ipmi.c
+++ b/discover/ipmi.c
@@ -223,7 +223,7 @@ bool ipmi_present(void)
 
 /* Reads and applies an IPMI interface config override, which closely follows
  * the format of an interface config struct as described in lib/types */
 
 /* Reads and applies an IPMI interface config override, which closely follows
  * the format of an interface config struct as described in lib/types */

-void parse_ipmi_interface_override(struct config *config, uint8_t *buf,
+int parse_ipmi_interface_override(struct config *config, uint8_t *buf,

                                uint16_t len)
 {
        struct interface_config *ifconf;
                                uint16_t len)
 {
        struct interface_config *ifconf;


@@ -240,14 +240,14 @@ void parse_ipmi_interface_override(struct config *config, uint8_t *buf,
 
        if (!hwsize || !ipsize) {
                pb_log("%s: Empty response\n", __func__);
 
        if (!hwsize || !ipsize) {
                pb_log("%s: Empty response\n", __func__);

-               return;
+               return -1;

        }
 
        /* At the moment only support 6-byte MAC addresses */
        if (hwsize != sizeof(ifconf->hwaddr)) {
                pb_log("Unsupported HW address size in network override: %u\n",
                       hwsize);
        }
 
        /* At the moment only support 6-byte MAC addresses */
        if (hwsize != sizeof(ifconf->hwaddr)) {
                pb_log("Unsupported HW address size in network override: %u\n",
                       hwsize);

-               return;
+               return -1;

        }
 
        /* Sanity check the IP address size */
        }
 
        /* Sanity check the IP address size */


@@ -259,14 +259,14 @@ void parse_ipmi_interface_override(struct config *config, uint8_t *buf,
                addr_len = INET6_ADDRSTRLEN;
        } else {
                pb_log("Unsupported IP address size: %u\n", ipsize);
                addr_len = INET6_ADDRSTRLEN;
        } else {
                pb_log("Unsupported IP address size: %u\n", ipsize);

-               return;
+               return -1;

        }
 
        /* Everything past here is the interface config */
        ifconf = talloc_zero(config, struct interface_config);
        if (!ifconf) {
                pb_log("Failed to allocate network override\n");
        }
 
        /* Everything past here is the interface config */
        ifconf = talloc_zero(config, struct interface_config);
        if (!ifconf) {
                pb_log("Failed to allocate network override\n");

-               return;
+               return -1;

        }
 
        /* Hardware Address */
        }
 
        /* Hardware Address */


@@ -281,7 +281,7 @@ void parse_ipmi_interface_override(struct config *config, uint8_t *buf,
                if (ipsize + ipsize  + 1 > len - i) {
                        pb_log("Expected data greater than buffer size\n");
                        talloc_free(ifconf);
                if (ipsize + ipsize  + 1 > len - i) {
                        pb_log("Expected data greater than buffer size\n");
                        talloc_free(ifconf);

-                       return;
+                       return -1;

                }
 
                /* IP address */
                }
 
                /* IP address */


@@ -289,7 +289,7 @@ void parse_ipmi_interface_override(struct config *config, uint8_t *buf,
                if (!inet_ntop(addr_type, &buf[i], ipstr, addr_len)) {
                        pb_log("Failed to convert ipaddr: %m\n");
                        talloc_free(ifconf);
                if (!inet_ntop(addr_type, &buf[i], ipstr, addr_len)) {
                        pb_log("Failed to convert ipaddr: %m\n");
                        talloc_free(ifconf);

-                       return;
+                       return -1;

                }
                i += ipsize;
 
                }
                i += ipsize;
 


@@ -303,17 +303,19 @@ void parse_ipmi_interface_override(struct config *config, uint8_t *buf,
                if (!inet_ntop(addr_type, &buf[i], gatewaystr, addr_len)) {
                        pb_log("Failed to convert gateway: %m\n");
                        talloc_free(ifconf);
                if (!inet_ntop(addr_type, &buf[i], gatewaystr, addr_len)) {
                        pb_log("Failed to convert gateway: %m\n");
                        talloc_free(ifconf);

-                       return;
+                       return -1;

                }
                ifconf->static_config.gateway = gatewaystr;
                i += ipsize;
        }
 
                }
                ifconf->static_config.gateway = gatewaystr;
                i += ipsize;
        }
 

-       pb_log("Applying IPMI network config\n");
+       pb_log("Applying IPMI network interface override\n");

 
        /* Replace any existing interface config */
        talloc_free(config->network.interfaces);
        config->network.n_interfaces = 1;
        config->network.interfaces = talloc(config, struct interface_config *);
        config->network.interfaces[0] = ifconf;
 
        /* Replace any existing interface config */
        talloc_free(config->network.interfaces);
        config->network.n_interfaces = 1;
        config->network.interfaces = talloc(config, struct interface_config *);
        config->network.interfaces[0] = ifconf;

+
+       return 0;

 }
 }