Vorbelegung Grün+Rot funktioniert jetzt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@883 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/src/install+setup/libsmooth/netstuff.c b/src/install+setup/libsmooth/netstuff.c
index 1fb95dc659548bc2e724316bcf255c696090cd2d..e742397c18fda53c96ce18ebef2b689a00860cdc 100644 (file)
--- a/src/install+setup/libsmooth/netstuff.c
+++ b/src/install+setup/libsmooth/netstuff.c
@@ -345,7 +345,7 @@ int get_knic(int card)              //returns "0" for zero cards or error and "1" card is fo
        strcpy(temp, ""); findkey(kv, searchstr, temp);
        if (strlen(temp)) {
                strcpy(knics[ card ].macaddr, temp);
-               strcpy(knics[ card ].colour, "GREEN");
+               strcpy(knics[ card ].colour, ucolourcard[card]);
 
                sprintf(searchstr, "%s_DESCRIPTION", ucolourcard[card]);
                findkey(kv, searchstr, temp);
@@ -359,6 +359,7 @@ int get_knic(int card)              //returns "0" for zero cards or error and "1" card is fo
                strcpy(knics[ card ].description, ctr[TR_UNSET]);
                ret_value = 0;
        }
+       freekeyvalues(kv);
 
        return ret_value;
 }

diff --git a/src/install+setup/setup/networking.c b/src/install+setup/setup/networking.c
index 39b08c79fa101a6eb50100a2f32f78c29f84aee3..57bf246be03dd5a625246682f6b981062a2f1690 100644 (file)
--- a/src/install+setup/setup/networking.c
+++ b/src/install+setup/setup/networking.c
@@ -334,9 +334,15 @@ int drivermenu(void)
                return 0;
        }
 
-       findkey(kv, "CONFIG_TYPE", temp);
-       configtype = atol(temp);
-       
+       if (findkey(kv, "CONFIG_TYPE", temp))
+               configtype = atol(temp);
+       else {
+               fprintf(flog,"setting CONFIG_TYPE = %s\n",temp);
+               configtype = atol(temp);
+               replacekeyvalue(kv, "CONFIG_TYPE", temp);
+               writekeyvalues(kv, CONFIG_ROOT "/ethernet/settings");
+       }
+
        strcpy(message, ctr[TR_CONFIGURE_NETWORK_DRIVERS]);
 
        kcount = 0;