Base build on 20231015, and defualt to FRR

build/bird/hvn0.lab.ipng.ch/host0-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn0.lab.ipng.ch/host0-1/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn0.lab.ipng.ch/tap0-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn0.lab.ipng.ch/host0-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn0.lab.ipng.ch/host0-1/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn0.lab.ipng.ch/tap0-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/frr/frr.conf

@@ -44,9 +44,6 @@ mpls ldp
   discovery transport-address 192.168.10.0
   label local advertise explicit-null
   !
-  interface e0
-  exit
-  !
   interface e1
   exit
   !
@@ -57,9 +54,6 @@ mpls ldp
   label local advertise explicit-null
   ttl-security disable
   !
-  interface e0
-  exit
-  !
   interface e1
   exit
   !

build/frr/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/frr/frr.conf

@@ -47,9 +47,6 @@ mpls ldp
   interface e0
   exit
   !
-  interface e1
-  exit
-  !
  exit-address-family
  !
  address-family ipv6
@@ -60,9 +57,6 @@ mpls ldp
   interface e0
   exit
   !
-  interface e1
-  exit
-  !
  exit-address-family
  !
 exit

build/frr/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/frr/frr.conf

@@ -44,9 +44,6 @@ mpls ldp
   discovery transport-address 192.168.11.0
   label local advertise explicit-null
   !
-  interface e0
-  exit
-  !
   interface e1
   exit
   !
@@ -57,9 +54,6 @@ mpls ldp
   label local advertise explicit-null
   ttl-security disable
   !
-  interface e0
-  exit
-  !
   interface e1
   exit
   !

build/frr/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/frr/frr.conf

@@ -47,9 +47,6 @@ mpls ldp
   interface e0
   exit
   !
-  interface e1
-  exit
-  !
  exit-address-family
  !
  address-family ipv6
@@ -60,9 +57,6 @@ mpls ldp
   interface e0
   exit
   !
-  interface e1
-  exit
-  !
  exit-address-family
  !
 exit

build/frr/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/frr/frr.conf

@@ -44,9 +44,6 @@ mpls ldp
   discovery transport-address 192.168.12.0
   label local advertise explicit-null
   !
-  interface e0
-  exit
-  !
   interface e1
   exit
   !
@@ -57,9 +54,6 @@ mpls ldp
   label local advertise explicit-null
   ttl-security disable
   !
-  interface e0
-  exit
-  !
   interface e1
   exit
   !

build/frr/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/frr/frr.conf

@@ -47,9 +47,6 @@ mpls ldp
   interface e0
   exit
   !
-  interface e1
-  exit
-  !
  exit-address-family
  !
  address-family ipv6
@@ -60,9 +57,6 @@ mpls ldp
   interface e0
   exit
   !
-  interface e1
-  exit
-  !
  exit-address-family
  !
 exit

build/frr/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

create

@@ -15,8 +15,8 @@
 ##     *  Unmount the staging directories
 ##     *  Start the VMs
 
-BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-bullseye-disk0@20230531-release}
-BUILD=${BUILD:=bird}
+BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-bookworm-disk0@20231015-release}
+BUILD=${BUILD:=frr}
 LAB=${LAB:=0}
 
 [ -r .lock${LAB} ] && {

overlays/_common/common/root/lab-build/perms

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local

overlays/frr/vpp/etc/frr/frr.conf.j2

@@ -46,12 +46,16 @@ mpls ldp
   discovery transport-address {{ loop4 }}
   label local advertise explicit-null
   !
+{% if node.id > 0 %}
   interface e0
   exit
   !
+{% endif %}
+{% if node.id < 3 %}
   interface e1
   exit
   !
+{% endif %}
  exit-address-family
  !
  address-family ipv6
@@ -59,12 +63,16 @@ mpls ldp
   label local advertise explicit-null
   ttl-security disable
   !
+{% if node.id > 0 %}
   interface e0
   exit
   !
+{% endif %}
+{% if node.id < 3 %}
   interface e1
   exit
   !
+{% endif %}
  exit-address-family
  !
 exit