From f6e9691b7f338c1fa337b87494dcf890b85960a6 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 20 Mar 2025 08:21:47 -0400 Subject: [PATCH] Amend arguments on IPv4 invocation It turns out that when busybox invokes openssl for IPv4, it does not pass a servername field. In this case, start amending arguments after '-verify' instead, to catch the verify_ip argument correctly. --- .../ubuntu20.04/initramfs/scripts/init-premount/confluent | 2 +- .../ubuntu22.04/initramfs/scripts/init-premount/confluent | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/confluent_osdeploy/ubuntu20.04/initramfs/scripts/init-premount/confluent b/confluent_osdeploy/ubuntu20.04/initramfs/scripts/init-premount/confluent index 297e5c3f..a974f04d 100755 --- a/confluent_osdeploy/ubuntu20.04/initramfs/scripts/init-premount/confluent +++ b/confluent_osdeploy/ubuntu20.04/initramfs/scripts/init-premount/confluent @@ -95,7 +95,7 @@ cat > /usr/bin/openssl << 'EOF' AMENDARGS=0 nargs="" for arg in $*; do - if [ "$arg" == "-servername" ]; then + if [ "$arg" == "-servername" -o "$arg" == "-verify" ]; then AMENDARGS=1 fi if [ "$AMENDARGS" == "1" ]; then diff --git a/confluent_osdeploy/ubuntu22.04/initramfs/scripts/init-premount/confluent b/confluent_osdeploy/ubuntu22.04/initramfs/scripts/init-premount/confluent index 302b6657..725560de 100755 --- a/confluent_osdeploy/ubuntu22.04/initramfs/scripts/init-premount/confluent +++ b/confluent_osdeploy/ubuntu22.04/initramfs/scripts/init-premount/confluent @@ -98,7 +98,7 @@ if [ -z "$DIRECTISO" ]; then AMENDARGS=0 nargs="" for arg in $*; do - if [ "$arg" == "-servername" ]; then + if [ "$arg" == "-servername" -o "$arg" == "-verify" ]; then AMENDARGS=1 fi if [ "$AMENDARGS" == "1" ]; then