From aa5aa2d8d7821013175ca86701914ac6df4cb674 Mon Sep 17 00:00:00 2001 From: Michel Jouvin Date: Tue, 12 Nov 2024 11:13:08 +0100 Subject: [PATCH] Define default installation boot protocol as static - Used to be the case in EL7 but defined in the EL7 variant and lost afterwards --- aii-ks/src/main/pan/quattor/aii/ks/config.pan | 12 +++++++----- aii-ks/src/main/pan/quattor/aii/ks/variants/el7.pan | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/aii-ks/src/main/pan/quattor/aii/ks/config.pan b/aii-ks/src/main/pan/quattor/aii/ks/config.pan index 8df6b20a..97a8e6c1 100644 --- a/aii-ks/src/main/pan/quattor/aii/ks/config.pan +++ b/aii-ks/src/main/pan/quattor/aii/ks/config.pan @@ -301,11 +301,13 @@ variable AII_OSINSTALL_BOOTDISK_ORDER ?= AII_OSINSTALL_DISKS['boot_order']; variable AII_OSINSTALL_DISABLE_SERVICE ?= null; "disable_service" ?= AII_OSINSTALL_DISABLE_SERVICE; - -# -# How will we configure the network during the installation? -# Default to 'dhcp' -variable AII_OSINSTALL_BOOTPROTO ?= 'dhcp'; +@{ +desc = default boot protocol for installation +values = choice between 'dhcp' or 'static' (see schema) +default = static +required = no +} +variable AII_OSINSTALL_BOOTPROTO ?= 'static'; "bootproto" ?= AII_OSINSTALL_BOOTPROTO; # diff --git a/aii-ks/src/main/pan/quattor/aii/ks/variants/el7.pan b/aii-ks/src/main/pan/quattor/aii/ks/variants/el7.pan index 9d997ee5..70931e6a 100644 --- a/aii-ks/src/main/pan/quattor/aii/ks/variants/el7.pan +++ b/aii-ks/src/main/pan/quattor/aii/ks/variants/el7.pan @@ -15,7 +15,6 @@ prefix "/system/aii/osinstall/ks"; # el7 "version" = "19.31"; -"bootproto" = "static"; "enable_sshd" = true; "cmdline" = true;