diff --git a/Earthfile b/Earthfile index 4bcf731..c771fe1 100644 --- a/Earthfile +++ b/Earthfile @@ -15,29 +15,6 @@ build-challenger: image: FROM $BASE_IMAGE ARG IMAGE - # TEST KCRYPT FROM BRANCH - ARG KCRYPT_DEV - ARG KCRYPT_DEV_BRANCH=main - IF [ "$KCRYPT_DEV" = "true" ] - RUN rm /usr/bin/kcrypt - COPY github.com/kairos-io/kcrypt:$KCRYPT_DEV_BRANCH+build-kcrypt/kcrypt /usr/bin/kcrypt - END - ARG IMMUCORE_DEV - ARG IMMUCORE_DEV_BRANCH=master - IF [ "$IMMUCORE_DEV" = "true" ] - RUN rm -Rf /usr/lib/dracut/modules.d/28immucore - RUN rm /etc/dracut.conf.d/10-immucore.conf - RUN rm /etc/dracut.conf.d/02-kairos-setup-initramfs.conf || exit 0 - RUN rm /etc/dracut.conf.d/50-kairos-initrd.conf || exit 0 - COPY github.com/kairos-io/immucore:$IMMUCORE_DEV_BRANCH+build-immucore/immucore /usr/bin/immucore - COPY github.com/kairos-io/immucore:$IMMUCORE_DEV_BRANCH+dracut-artifacts/28immucore /usr/lib/dracut/modules.d/28immucore - COPY github.com/kairos-io/immucore:$IMMUCORE_DEV_BRANCH+dracut-artifacts/10-immucore.conf /etc/dracut.conf.d/10-immucore.conf - # Need to rerun dracut so the updated binaries get in the initramfs - RUN --no-cache kernel=$(ls /lib/modules | head -n1) && depmod -a "${kernel}" - RUN --no-cache kernel=$(ls /lib/modules | head -n1) && dracut -f "/boot/initrd-${kernel}" "${kernel}" && ln -sf "initrd-${kernel}" /boot/initrd - END - - # END COPY +build-challenger/kcrypt-discovery-challenger /system/discovery/kcrypt-discovery-challenger SAVE IMAGE $IMAGE diff --git a/cmd/discovery/client/config.go b/cmd/discovery/client/config.go index 329d5ec..bf6c851 100644 --- a/cmd/discovery/client/config.go +++ b/cmd/discovery/client/config.go @@ -29,7 +29,7 @@ func unmarshalConfig() (Config, error) { var result Config o := &collector.Options{NoLogs: true} - if err := o.Apply(collector.Directories(kconfig.ConfigScanDirs...)); err != nil { + if err := o.Apply(collector.Directories(append(kconfig.ConfigScanDirs, "/tmp/oem")...)); err != nil { return result, err }