Die Datei "/etc/udev/rules.d/30-persistent-network.rules" wird jetzt

[people/pmueller/ipfire-2.x.git] / src / install+setup / setup / networking.c

diff --git a/src/install+setup/setup/networking.c b/src/install+setup/setup/networking.c
index 9bb9fd649fb6cc12a17dc59c3a09493ebb38246b..b2e51033ce7ea9532fdd419404e2f6faf17f0058 100644 (file)
--- a/src/install+setup/setup/networking.c
+++ b/src/install+setup/setup/networking.c
@@ -136,7 +136,7 @@ int handlenetworking(void)
                                ctr[TR_PULLING_NETWORK_UP]);
                }
        }
-       
+       create_udev();
        return 1;
 }
 
@@ -154,7 +154,7 @@ int oktoleave(char *errormessage)
        }       
 
        strcpy(temp, "0"); findkey(kv, "CONFIG_TYPE", temp); configtype = atol(temp);
-       if (configtype < 0 || configtype > 7) configtype = 0;
+       if (configtype < 1 || configtype > 4) configtype = 0;
 
        if (HAS_BLUE)
        {
@@ -236,7 +236,7 @@ int firstmenu(void)
                strcpy(networkrestart, ctr[TR_RESTART_REQUIRED]);
 
        strcpy(temp, ""); findkey(kv, "CONFIG_TYPE", temp); x = atol(temp);
-       if (x < 0 || x > 7) x = 0;
+       if (x < 1 || x > 4) x = 0;
        /* Format heading bit. */
        snprintf(message, 1000, ctr[TR_CURRENT_CONFIG], configtypenames[x],
                networkrestart);
@@ -348,6 +348,8 @@ int drivermenu(void)
                        strcpy(knics[_GREEN_CARD_].colour, "GREEN");
                        findkey(kv, "GREEN_DESCRIPTION", temp);
                        strcpy(knics[_GREEN_CARD_].description, temp);
+                       findkey(kv, "GREEN_DRIVER", temp);
+                       strcpy(knics[_GREEN_CARD_].driver, temp);
                        kcount++;
                } else {
                        strcpy(knics[_GREEN_CARD_].description, ctr[TR_UNSET]);
@@ -367,6 +369,8 @@ int drivermenu(void)
                        strcpy(knics[_RED_CARD_].colour, "RED");
                        findkey(kv, "RED_DESCRIPTION", temp);
                        strcpy(knics[_RED_CARD_].description, temp);
+                       findkey(kv, "RED_DRIVER", temp);
+                       strcpy(knics[_RED_CARD_].driver, temp);
                        kcount++;
                } else {
                        strcpy(knics[_RED_CARD_].description, ctr[TR_UNSET]);
@@ -386,6 +390,8 @@ int drivermenu(void)
                        strcpy(knics[_ORANGE_CARD_].colour, "ORANGE");
                        findkey(kv, "ORANGE_DESCRIPTION", temp );
                        strcpy(knics[_ORANGE_CARD_].description, temp );
+                       findkey(kv, "ORANGE_DRIVER", temp);
+                       strcpy(knics[_ORANGE_CARD_].driver, temp);
                        kcount++;
                } else {
                        strcpy(knics[_ORANGE_CARD_].description, ctr[TR_UNSET]);
@@ -405,6 +411,8 @@ int drivermenu(void)
                        strcpy(knics[_BLUE_CARD_].colour, "BLUE");
                        findkey(kv, "BLUE_DESCRIPTION", temp );
                        strcpy(knics[_BLUE_CARD_].description, temp);
+                       findkey(kv, "BLUE_DRIVER", temp);
+                       strcpy(knics[_BLUE_CARD_].driver, temp);
                        kcount++;
                } else {
                        strcpy(knics[_BLUE_CARD_].description, ctr[TR_UNSET]);
@@ -756,7 +764,7 @@ int dnsgatewaymenu(void)
                return 0;
        }
 
-       strcpy(temp, "0"); findkey(kv, "CONFIG_TYPE", temp);
+/*     strcpy(temp, "0"); findkey(kv, "CONFIG_TYPE", temp);
        configtype = atol(temp);
        
        if (RED_IS_NOT_ETH)
@@ -765,7 +773,7 @@ int dnsgatewaymenu(void)
                errorbox(ctr[TR_DNS_GATEWAY_WITH_GREEN]);
                return 0;
        }
-
+*/
        entries[DNS1].text = ctr[TR_PRIMARY_DNS];
        strcpy(temp, ""); findkey(kv, "DNS1", temp);
        values[DNS1] = strdup(temp);