setup: add ignore to all no nic assigned errors

diff --git a/config/rootfiles/core/135/filelists/files b/config/rootfiles/core/135/filelists/files
index d8df9f65b4a8669e3136188c38fcf3110fd40021..34ab272bf727ff5859ebff30adbaae02ba04bc8f 100644 (file)
--- a/config/rootfiles/core/135/filelists/files
+++ b/config/rootfiles/core/135/filelists/files
@@ -10,4 +10,5 @@ etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders
 etc/rc.d/init.d/partresize
 etc/rc.d/init.d/unbound
 etc/sysctl.conf
+usr/sbin/setup
 usr/sbin/unbound-dhcp-leases-bridge

diff --git a/src/setup/networking.c b/src/setup/networking.c
index 00dfc4b5a7d3a8aa02344d2966a60db6f7776007..d6cd30cff0219b7b92958174ce286e2afeaf004d 100644 (file)
--- a/src/setup/networking.c
+++ b/src/setup/networking.c
@@ -144,9 +144,13 @@ int oktoleave(void)
                strcpy(temp, ""); findkey(kv, "GREEN_DEV", temp);
                if (!(strlen(temp)))
                {
-                       errorbox(_("No GREEN interface assigned."));
-                       freekeyvalues(kv);
-                       return 0;
+                       rc = newtWinChoice(_("Error"), _("OK"), _("Ignore"),
+                               _("No GREEN interface assigned."));
+                       if (rc == 0 || rc == 1)
+                       {
+                               freekeyvalues(kv);
+                               return 0;
+                       }
                }
                if (!(interfacecheck(kv, "GREEN")))
                {
@@ -181,9 +185,13 @@ int oktoleave(void)
                strcpy(temp, ""); findkey(kv, "ORANGE_DEV", temp);
                if (!(strlen(temp)))
                {
-                       errorbox(_("No ORANGE interface assigned."));
-                       freekeyvalues(kv);
-                       return 0;
+                       rc = newtWinChoice(_("Error"), _("OK"), _("Ignore"),
+                               _("No ORANGE interface assigned."));
+                       if (rc == 0 || rc == 1)
+                       {
+                               freekeyvalues(kv);
+                               return 0;
+                       }
                }
                if (!(interfacecheck(kv, "ORANGE")))
                {
@@ -197,9 +205,13 @@ int oktoleave(void)
                strcpy(temp, ""); findkey(kv, "BLUE_DEV", temp);
                if (!(strlen(temp)))
                {
-                       errorbox(_("No BLUE interface assigned."));
-                       freekeyvalues(kv);
-                       return 0;
+                       rc = newtWinChoice(_("Error"), _("OK"), _("Ignore"),
+                               _("No BLUE interface assigned."));
+                       if (rc == 0 || rc == 1)
+                       {
+                               freekeyvalues(kv);
+                               return 0;
+                       }
                }
                if (!(interfacecheck(kv, "BLUE")))
                {