installation: Update env.sh

Use Nexedi's OBS repository.
Use correct package name and versions.
Fix some bugs.

dracut.module/configure

@@ -3,8 +3,8 @@
 # At the moment, this is not a standard configure script. It is only used to generate a makefile with the good package names.
 source ../installation/env.sh
 
-FLB_PATH=/opt/${FLUENTBIT_NAME_AND_VERSION}
-MCA_PATH=/opt/${MCA_NAME_AND_VERSION}
+FLB_PATH=/opt/${FLUENTBIT_PACKAGE_NAME}
+MCA_PATH=/opt/${MCA_PACKAGE_NAME}
 
 PACKAGE_REGEX="s|%FLB_PATH%|${FLB_PATH}|g;s|%MCA_PATH%|${MCA_PATH}|g"
 

installation/env.sh

@@ -7,10 +7,10 @@ PROJECT_DIR=$GIT_ROOT
 
 ### TO BE MODIFIED BY USERS ###
 ## Packages
-MCA_PACKAGE_NAME=dep--mca--static
-FLUENTBIT_PACKAGE_NAME=dep--fluent-bit
-MCA_VERSION=1-1
-FLUENTBIT_VERSION=1-1
+MCA_PACKAGE_NAME=mca--static
+FLUENTBIT_PACKAGE_NAME=fluent-bit
+MCA_VERSION=0.2h+0.1i+1.0.279+dep-1
+FLUENTBIT_VERSION=1.9.7+1.0.279+dep-1
 TARGET_DISTRIBUTION=Debian_11
 ARCH=amd64
 PACKAGE_EXTENSION=.deb
@@ -35,7 +35,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:/oph.nxd/${TARGET_DISTRIBUTION}/${ARCH}/"
+URL_PATTERN="https://download.opensuse.org/repositories/home:VIFIBnexedi/${TARGET_DISTRIBUTION}/${ARCH}/"
 MCA_PACKAGE_URL=${URL_PATTERN}/${MCA_PACKAGE_FILE}
 FLUENTBIT_PACKAGE_URL=${URL_PATTERN}/${FLUENTBIT_PACKAGE_FILE}
 
@@ -50,7 +50,7 @@ dracut_output_file=dracut-output
 
 # used mainly in uefi-keys/make_keys.sh
 CERT_DIR=uefi-keys/public-certificates
-KEYS_DIR=private-keys
+KEYS_DIR=uefi-keys/private-keys
 PUBLIC_CERT_DIR=${PROJECT_DIR}/${CERT_DIR}/${SERVER_GROUP}
 PRIVATE_KEYS_DIR=${PROJECT_DIR}/${KEYS_DIR}/${SERVER_GROUP}
 PUBLIC_CERT_DIR=$(realpath -m "$PUBLIC_CERT_DIR")

installation/remove-dependencies.sh

@@ -12,10 +12,6 @@ source env.sh
 # do not uninstall the useful tools
 
 # building initramfs
-rm -f /opt/${MCA_NAME_AND_VERSION}/etc/flb.conf.in # temporary fix
-rm -f /opt/${MCA_NAME_AND_VERSION}/etc/flb.conf # 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}.*
-#rm -f ${FLUENTBIT_PACKAGE_FILE} ${FLUENTBIT_PACKAGE_FILE}.*
 apt -y remove ${APT_SPECIFIC_PACKAGES} || true