installation/env.sh: Roll back to previous distribution handling (i.e. before...

installation/env.sh: Roll back to previous distribution handling (i.e. before the Debian 10 problem).

installation/env.sh

@@ -10,7 +10,7 @@ MCA_PACKAGE_NAME=dep--mca--static
 FLUENTBIT_PACKAGE_NAME=dep--fluent-bit
 MCA_VERSION=1-1
 FLUENTBIT_VERSION=1-1
-TARGET_DISTRIBUTION=Debian_10
+TARGET_DISTRIBUTION=Debian_11
 ARCH=amd64
 PACKAGE_EXTENSION=.deb
 WENDELIN_REFERENCE=douai001-capri009
@@ -27,10 +27,7 @@ APT_SPECIFIC_PACKAGES="dracut-core dracut dracut-network"
 MCA_PACKAGE_FILE=${MCA_NAME_AND_VERSION}_${ARCH}${PACKAGE_EXTENSION}
 FLUENTBIT_PACKAGE_FILE=${FLUENTBIT_NAME_AND_VERSION}_${ARCH}${PACKAGE_EXTENSION}
 URL_PATTERN="https://download.opensuse.org/repositories/home:/fg.nxd/${TARGET_DISTRIBUTION}/${ARCH}/"
-# at the moment, the MCA package is not compiling for Debian 10 (the fluent-bit plugin does not compile because of its Go dependency)
-# so we try with the Debian 11 version
-MCA_PACKAGE_URL="https://download.opensuse.org/repositories/home:/fg.nxd/Debian_11/${ARCH}/${MCA_PACKAGE_FILE}"
-#MCA_PACKAGE_URL=${URL_PATTERN}/${MCA_PACKAGE_FILE}
+MCA_PACKAGE_URL=${URL_PATTERN}/${MCA_PACKAGE_FILE}
 FLUENTBIT_PACKAGE_URL=${URL_PATTERN}/${FLUENTBIT_PACKAGE_FILE}
 
 # used mainly in installation/install.sh and installation/uninstall.sh

installation/remove-dependencies.sh

@@ -12,6 +12,7 @@ source env.sh
 # do not uninstall the useful tools
 
 # building initramfs
+rm -f /opt/${MCA_NAME_AND_VERSION}/etc/flb.conf.in # temporary fix
 apt-get -y remove ${MCA_PACKAGE_NAME} || true
 apt-get -y remove ${FLUENTBIT_PACKAGE_NAME} || true
 rm -f ${MCA_PACKAGE_FILE} ${MCA_PACKAGE_FILE}.*