From: root <root@sysrq>
Date: Wed, 4 Apr 2007 11:09:36 +0000 (+0200)
Subject: Ordering in portconfig.
X-Git-Url: https://git.sesse.net/?p=nms;a=commitdiff_plain;h=ea6dfbe82f8c2be844a374b0f237dce4f1737562

Ordering in portconfig.
---

diff --git a/config/make-port-config.pl b/config/make-port-config.pl
index 893d4f4..72416a0 100755
--- a/config/make-port-config.pl
+++ b/config/make-port-config.pl
@@ -1,7 +1,8 @@
 #! /usr/bin/perl
 open PATCHLIST, "<patchlist.txt"
 	or die "patchlist.txt: $!";
-my %distros = ();
+my %vlans = ();
+my %ports = ();
 
 while (<PATCHLIST>) {
 	chomp;
@@ -28,10 +29,13 @@ while (<PATCHLIST>) {
 	my $vlan = "$row$switch";
 	my $ipv6 = sprintf "F%02u%u", $row, $switch;
 
-	$distros{$distro} .= <<"EOF";
+	$vlans{$distro} .= <<"EOF";
 vlan $vlan
   name $name
 !
+EOF
+ 
+	$ports{$distro} .= <<"EOF";
 default interface vlan $vlan
 interface vlan $vlan
   description $name
@@ -41,11 +45,11 @@ interface vlan $vlan
   no ip proxy-arp
   ip access-group great-wall-of-tg in
   ipv6 address 2001:16D8:FFFF:${ipv6}::1/64
-  ip igmp version 3
+  ip igmp version 2
   ip pim sparse-mode
   no shutdown
+  exit
 !
- 
 default interface $port
 interface $port
  description $name
@@ -57,14 +61,16 @@ interface $port
 
  storm-control broadcast level 2
  no shutdown
+ exit
 !
 EOF
 }
 
-for my $distro (keys %distros) {
+for my $distro (keys %vlans) {
 	open DISTRO, ">$distro-config"
 		or die "$distro-config: $!";
-	print DISTRO $distros{$distro};
+	print DISTRO $vlans{$distro};
+	print DISTRO $ports{$distro};
 	print DISTRO "end\n";
 	close DISTRO;
 }