add dhcp class id support (#107946). requires pump >= 0.8.20

4 files changed, 22 insertions, 7 deletions

diff --git a/loader2/loader.c b/loader2/loader.c
index 6f952679b..3e63cf455 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -527,6 +527,9 @@ static int parseCmdLineFlags(int flags, struct loaderData_s * loaderData,
         else if (!strncasecmp(argv[i], "ksdevice=", 9)) {
             loaderData->netDev = strdup(argv[i] + 9);
             loaderData->netDev_set = 1;
+        } else if (!strncasecmp(argv[i], "dhcpclass=", 8)) {
+            loaderData->netCls = strdup(argv[i] + 8);
+            loaderData->netCls_set = 1;
         }
         else if (!strcasecmp(argv[i], "ks") || !strncasecmp(argv[i], "ks=", 3))
             loaderData->ksFile = strdup(argv[i]);
@@ -897,7 +900,7 @@ static char *doLoaderMain(char * location,
 	    /* populate netDev based on any kickstart data */
 	    setupNetworkDeviceConfig(&netDev, loaderData, flags);
 
-            rc = readNetConfig(devName, &netDev, flags);
+            rc = readNetConfig(devName, &netDev, loaderData->netCls, flags);
             if ((rc == LOADER_BACK) || (rc == LOADER_ERROR) ||
                 ((dir == -1) && (rc == LOADER_NOOP))) {
                 step = STEP_IFACE;
diff --git a/loader2/loader.h b/loader2/loader.h
index f18705759..db005ab83 100644
--- a/loader2/loader.h
+++ b/loader2/loader.h
@@ -83,6 +83,8 @@ struct loaderData_s {
     int kbd_set;
     char * netDev;
     int netDev_set;
+    char * netCls;
+    int netCls_set;
     char * ip, * netmask, *gateway, *dns, *hostname, *ptpaddr, *ethtool;
     int mtu;
     int noDns;
diff --git a/loader2/net.c b/loader2/net.c
index 3691cb81c..299010ab2 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -199,6 +199,8 @@ void printLoaderDataIPINFO(struct loaderData_s *loaderData) {
     logMessage("loaderData->noDns      = %d", loaderData->noDns);
     logMessage("loaderData->netDev_set = %d", loaderData->netDev_set);
     logMessage("loaderData->netDev     = %s", loaderData->netDev);
+    logMessage("loaderData->netCls_set = %d", loaderData->netCls_set);
+    logMessage("loaderData->netCls     = %s", loaderData->netCls);
 }
 
 /* given loader data from kickstart, populate network configuration struct */
@@ -234,7 +236,7 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg,
 
             if (!FL_TESTING(flags)) {
                 waitForLink(loaderData->netDev);
-                chptr = pumpDhcpRun(loaderData->netDev, 0, 0, NULL, &cfg->dev, NULL);
+                chptr = pumpDhcpClassRun(loaderData->netDev, 0, 0, NULL, loaderData->netCls ? loaderData->netCls : "anaconda", &cfg->dev, NULL);
             } else {
                 chptr = NULL;
             }
@@ -346,7 +348,8 @@ void setupNetworkDeviceConfig(struct networkDeviceConfig * cfg,
     cfg->noDns = loaderData->noDns;
 }
 
-int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) {
+int readNetConfig(char * device, struct networkDeviceConfig * cfg, 
+                  char * dhcpclass, int flags) {
     newtComponent text, f, okay, back, answer, dhcpCheckbox;
     newtGrid grid, subgrid, buttons;
     struct networkDeviceConfig newCfg;
@@ -485,7 +488,7 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) {
                           _("Sending request for IP information for %s..."), 
                           device, 0);
                 waitForLink(device);
-                chptr = pumpDhcpRun(device, 0, 0, NULL, &newCfg.dev, NULL);
+                chptr = pumpDhcpClassRun(device, 0, 0, NULL, dhcpclass ? dhcpclass : "anaconda", &newCfg.dev, NULL);
                 newtPopWindow();
             } else {
                 chptr = NULL;
@@ -678,13 +681,14 @@ int findHostAndDomain(struct networkDeviceConfig * dev, int flags) {
 
 void setKickstartNetwork(struct loaderData_s * loaderData, int argc, 
                          char ** argv, int * flagsPtr) {
-    char * arg, * bootProto = NULL, * device = NULL, *ethtool = NULL;
+    char * arg, * bootProto = NULL, * device = NULL, *ethtool = NULL, * class = NULL;
     int noDns = 0, rc;
     poptContext optCon;
 
     struct poptOption ksOptions[] = {
         { "bootproto", '\0', POPT_ARG_STRING, &bootProto, 0 },
         { "device", '\0', POPT_ARG_STRING, &device, 0 },
+        { "dhcpclass", '\0', POPT_ARG_STRING, &class, 0 },
         { "gateway", '\0', POPT_ARG_STRING, NULL, 'g' },
         { "ip", '\0', POPT_ARG_STRING, NULL, 'i' },
         { "nameserver", '\0', POPT_ARG_STRING, NULL, 'n' },
@@ -755,6 +759,11 @@ void setKickstartNetwork(struct loaderData_s * loaderData, int argc,
         loaderData->netDev_set = 1;
     }
 
+    if (class) {
+        loaderData->netCls = strdup(class);
+        loaderData->netCls_set = 1;
+    }
+
     if (ethtool) {
         if (loaderData->ethtool)
             free(loaderData->ethtool);
@@ -918,7 +927,8 @@ int kickstartNetworkUp(struct loaderData_s * loaderData,
 
     setupNetworkDeviceConfig(netCfgPtr, loaderData, flags);
 
-    rc = readNetConfig(loaderData->netDev, netCfgPtr, flags);
+    rc = readNetConfig(loaderData->netDev, netCfgPtr, loaderData->netCls, 
+                       flags);
     if ((rc == LOADER_BACK) || (rc == LOADER_ERROR)) {
         logMessage("unable to setup networking");
         return -1;
diff --git a/loader2/net.h b/loader2/net.h
index c79bcf33b..f79fec223 100644
--- a/loader2/net.h
+++ b/loader2/net.h
@@ -12,7 +12,7 @@ struct networkDeviceConfig {
 };
 
 int readNetConfig(char * device, struct networkDeviceConfig * dev, 
-		  int flags);
+		  char * dhcpclass, int flags);
 int configureNetwork(struct networkDeviceConfig * dev);
 int writeNetInfo(const char * fn, struct networkDeviceConfig * dev);
 int findHostAndDomain(struct networkDeviceConfig * dev, int flags);