[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc826e8628141abce615699a8c10592233dc467c

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc826e8628141abce615699a8c10592233dc467c

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 2409 bytes --]

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  cc826e8628141abce615699a8c10592233dc467c (commit)
      from  763efaf672a27297e274fbe526a3c49ea96904ee (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 cc826e8628141abce615699a8c10592233dc467c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Sep 9 13:58:15 2022 +0000

    setaliases: Use "secondary" flag instead of scope
    
    The scope option does not seem to work at all now, which is surprising
    since I tested it quite well.
    
    The secondary flag cannot be set from userspace (aparently), but it
    works, so I would prefer to go with this option for now.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 src/misc-progs/setaliases.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/src/misc-progs/setaliases.c b/src/misc-progs/setaliases.c
index a541a4fd2..4b18ba325 100644
--- a/src/misc-progs/setaliases.c
+++ b/src/misc-progs/setaliases.c
@@ -28,8 +28,6 @@
 struct keyvalue *kv = NULL;
 FILE *file = NULL;
 
-#define SCOPE 128
-
 void exithandler(void)
 {
 	if (kv) freekeyvalues(kv);
@@ -125,7 +123,7 @@ int main(void)
 	alias = 0;
 	do {
 		snprintf(command, STRING_SIZE - 1,
-			"ip addr flush dev red%d scope %d 2>/dev/null", alias++, SCOPE);
+			"ip addr flush secondary dev red%d 2>/dev/null", alias++);
 	} while (safe_system(command) == 0);
 
 	/* Now set up the new aliases from the config file */
@@ -184,8 +182,8 @@ int main(void)
 		if (!intf)
 			intf = red_dev;
 
-		snprintf(command, STRING_SIZE - 1, "ip addr add %s/%s dev %s scope %d",
-			aliasip, red_netmask, intf, SCOPE);
+		snprintf(command, STRING_SIZE - 1, "ip addr add %s/%s secondary dev %s 2>/dev/null",
+			aliasip, red_netmask, intf);
 		safe_system(command);
 
 		alias++;


hooks/post-receive
--
IPFire 2.x development tree