[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfire-scm
Subject:    [git.ipfire.org] IPFire 2.x development tree branch, next, updated. dc362263f4d1b2e1551e7cca406e82ed
From:       Arne Fitzenreiter <git () ipfire ! org>
Date:       2019-08-06 12:20:07
Message-ID: 20190806122007.B3B0C60AC0 () people01 ! haj ! ipfire ! org
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  dc362263f4d1b2e1551e7cca406e82eddcd01aee (commit)
      from  6836e528e521b94e8e4360451f11a5b9ce1d82d2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc362263f4d1b2e1551e7cca406e82eddcd01aee
Author: Arne Fitzenreiter <arne_f@ipfire.org>
Date:   Tue Aug 6 09:17:41 2019 +0000

    setup: add ignore to all no nic assigned errors

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/135/filelists/files |  1 +
 src/setup/networking.c                    | 30 +++++++++++++++++++++---------
 2 files changed, 22 insertions(+), 9 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/135/filelists/files b/config/rootfiles/core/135/filelists/files
index d8df9f65b..34ab272bf 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 00dfc4b5a..d6cd30cff 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")))
 		{


hooks/post-receive
--
IPFire 2.x development tree
_______________________________________________
IPFire-SCM mailing list
IPFire-SCM@lists.ipfire.org
https://lists.ipfire.org/mailman/listinfo/ipfire-scm
[prev in list] [next in list] [prev in thread] [next in thread]