Package: release.debian.org
Severity: normal
Tags: trixie
X-Debbugs-Cc: [email protected]
Control: affects -1 + src:ikvswitch
User: [email protected]
Usertags: pu

Hi there!

[ Reason ]
There's 3 small fixes that I'd like to push to Trixie.

1/ ikvswitch now pushes forwarding to /etc/sysctl.d in the VMs
it creates, as modifying sysctl.conf doesn't work anymore in
Trixie (the file doesn't exist anymore).

2/ ikvswitch now creates Trixie VMs by default, not Bookworm
(which is why I didn't notice the issue in 1/ previously).

3/ Makes the removal of the ipmi dummy bridge indempotant,
by adding || true to it.

[ Impact ]
ikvswitch would setup Bookworm by default, and running
"ikvswitch-setup stop" could fail.

[ Tests ]
This is part of my OpenStack CI that I run almost everyday,
so I'm sure this works.

[ Risks ]
Trivial fix, see attached diff.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

Please allow me to upload ikvswitch 1.0.4+deb13u1 to
Trixie pu.

Cheers,

Thomas Goirand (zigo)
diff -Nru ikvswitch-1.0.4/debian/changelog 
ikvswitch-1.0.4+deb13u1/debian/changelog
--- ikvswitch-1.0.4/debian/changelog    2025-04-11 14:07:58.000000000 +0200
+++ ikvswitch-1.0.4+deb13u1/debian/changelog    2025-08-03 22:54:49.000000000 
+0200
@@ -1,3 +1,12 @@
+ikvswitch (1.0.4+deb13u1) trixie; urgency=medium
+
+  * Write in /etc/sysctl.d/00-forward-internet.conf as sysctl.conf is gone in
+    Trixie.
+  * Use Trixie as default distro for the setup.
+  * Add || true when doing "ip link set down dev" if ipmi bridge.
+
+ -- Thomas Goirand <[email protected]>  Sun, 03 Aug 2025 22:54:49 +0200
+
 ikvswitch (1.0.4) unstable; urgency=medium
 
   * Allow cl1-network-2 to adverize BGP.
diff -Nru ikvswitch-1.0.4/etc/ikvswitch/ikvswitch.conf 
ikvswitch-1.0.4+deb13u1/etc/ikvswitch/ikvswitch.conf
--- ikvswitch-1.0.4/etc/ikvswitch/ikvswitch.conf        2025-04-11 
14:07:58.000000000 +0200
+++ ikvswitch-1.0.4+deb13u1/etc/ikvswitch/ikvswitch.conf        2025-08-03 
22:54:49.000000000 +0200
@@ -148,7 +148,7 @@
 ### Other params ###
 ####################
 # Name of the Debian release to use
-DEBIAN_RELEASE=bookworm
+DEBIAN_RELEASE=trixie
 
 # Debian mirror to use for debootstrap
 DEBIAN_MIRROR=http://deb.debian.org/debian
diff -Nru ikvswitch-1.0.4/usr/bin/ikvswitch-host-networking 
ikvswitch-1.0.4+deb13u1/usr/bin/ikvswitch-host-networking
--- ikvswitch-1.0.4/usr/bin/ikvswitch-host-networking   2025-04-11 
14:07:58.000000000 +0200
+++ ikvswitch-1.0.4+deb13u1/usr/bin/ikvswitch-host-networking   2025-08-03 
22:54:49.000000000 +0200
@@ -51,7 +51,7 @@
        ###########################
        ### ipmi_sim networking ###
        ###########################
-       ip link set down dev ${HOST_IPMI_BRIDGE_NAME}
+       ip link set down dev ${HOST_IPMI_BRIDGE_NAME} || true
        ip addr delete ${HOST_IPMI_IP}/24 dev ${HOST_IPMI_BRIDGE_NAME} || true
        brctl delif ${HOST_IPMI_BRIDGE_NAME} ${VM_TAP_NIC} || true
        brctl delbr ${HOST_IPMI_BRIDGE_NAME} || true
diff -Nru ikvswitch-1.0.4/usr/bin/ikvswitch-setup 
ikvswitch-1.0.4+deb13u1/usr/bin/ikvswitch-setup
--- ikvswitch-1.0.4/usr/bin/ikvswitch-setup     2025-04-11 14:07:58.000000000 
+0200
+++ ikvswitch-1.0.4+deb13u1/usr/bin/ikvswitch-setup     2025-08-03 
22:54:49.000000000 +0200
@@ -127,8 +127,8 @@
        sed -i s/bgpd=no/bgpd=yes/ ${MOUNT_DIR}/etc/frr/daemons
 
        # make sure we're ip forwarding
-       sed -i 's/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=1/' 
${MOUNT_DIR}/etc/sysctl.conf
-       sed -i 
's/#net.ipv6.conf.all.forwarding=1/net.ipv6.conf.all.forwarding=1/' 
${MOUNT_DIR}/etc/sysctl.conf
+        echo "net.ipv4.ip_forward=1" 
>${MOUNT_DIR}/etc/sysctl.d/00-forward-internet.conf
+        echo "net.ipv6.conf.all.forwarding=1" 
>>${MOUNT_DIR}/etc/sysctl.d/00-forward-internet.conf
 
        # Configure FRR and /etc/network/interfaces
        ###############################

Reply via email to