From dc362263f4d1b2e1551e7cca406e82eddcd01aee Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 6 Aug 2019 09:17:41 +0000 Subject: [PATCH] setup: add ignore to all no nic assigned errors --- config/rootfiles/core/135/filelists/files | 1 + src/setup/networking.c | 30 ++++++++++++++++------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/core/135/filelists/files b/config/rootfiles/core/135/filelists/files index d8df9f65b4..34ab272bf7 100644 --- 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 00dfc4b5a7..d6cd30cff0 100644 --- 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"))) { -- 2.39.2