setup: change persistent network rules for new udev.

diff --git a/src/install+setup/libsmooth/netstuff.c b/src/install+setup/libsmooth/netstuff.c
index 1c6eb42e6ae1bffab5b608f16d777bd12c337966..8c6f3fa90f7158a946912d9fa483b1dbf7015085 100644 (file)
--- a/src/install+setup/libsmooth/netstuff.c
+++ b/src/install+setup/libsmooth/netstuff.c
@@ -532,7 +532,7 @@ int create_udev(void)
        for (i = 0 ; i < 4 ; i++)
        {
                if (strcmp(knics[i].macaddr, "")) {
-                       fprintf(fp,"ACTION==\"add\", SUBSYSTEM==\"net\", SYSFS{type}==\"1\", SYSFS{address}==\"%s\", NAME=\"%s0\" # %s\n", knics[i].macaddr, lcolourcard[i], knics[i].description);
+                       fprintf(fp,"\n# %s\nACTION==\"add\", SUBSYSTEM==\"net\", ATTR{type}==\"1\", ATTR{address}==\"%s\", NAME=\"%s0\"\n", knics[i].description, knics[i].macaddr, lcolourcard[i]);
                }
        }
        fclose(fp);

diff --git a/src/install+setup/setup/networking.c b/src/install+setup/setup/networking.c
index 9c13717158f44f701d33da5886dbf36a262b7550..edd3c71af0d60560c64b0f41616640c1eb3c60cd 100644 (file)
--- a/src/install+setup/setup/networking.c
+++ b/src/install+setup/setup/networking.c
@@ -112,6 +112,8 @@ int handlenetworking(void)
                        runcommandwithstatus("/etc/rc.d/init.d/network start",
                                ctr[TR_PULLING_NETWORK_UP]);
                }
+       } else {
+               rename_nics();
        }
        create_udev();
        return 1;