rancher/immucore
1
0
Fork 0
mirror of https://github.com/kairos-io/immucore.git synced 2025-08-22 16:16:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dracut service install

Browse Source 
Signed-off-by: Itxaka <itxaka@spectrocloud.com>
This commit is contained in:
Itxaka 2023-02-06 21:45:01 +01:00
parent 66aa6627f7
commit 14e0faacee
3 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Earthfile
View File

@ -78,7 +78,7 @@ build-dracut:
RUN rm /etc/dracut.conf.d/02-cos-immutable-rootfs.conf RUN rm /etc/dracut.conf.d/02-cos-immutable-rootfs.conf
END END
RUN kernel=$(ls /lib/modules | head -n1) && \ RUN kernel=$(ls /lib/modules | head -n1) && \
dracut -f "/boot/initrd-${kernel}" "${kernel}" && \ dracut -v -f "/boot/initrd-${kernel}" "${kernel}" && \
ln -sf "initrd-${kernel}" /boot/initrd ln -sf "initrd-${kernel}" /boot/initrd
ARG INITRD=$(readlink -f /boot/initrd) ARG INITRD=$(readlink -f /boot/initrd)
SAVE ARTIFACT $INITRD Initrd AS LOCAL build/initrd-$VERSION SAVE ARTIFACT $INITRD Initrd AS LOCAL build/initrd-$VERSION

14
dracut/28immucore/generator.sh
View File

@ -7,8 +7,6 @@ GENERATOR_DIR="$2"
[ -z "$GENERATOR_DIR" ] && exit 1 [ -z "$GENERATOR_DIR" ] && exit 1
[ -d "$GENERATOR_DIR" ] || mkdir "$GENERATOR_DIR" [ -d "$GENERATOR_DIR" ] || mkdir "$GENERATOR_DIR"
oem_label=$(getarg rd.cos.oemlabel=)
# See https://github.com/kairos-io/packages/blob/d12b12b043a71d8471454f7b4fc84c3181d2bf60/packages/system/dracut/immutable-rootfs/30cos-immutable-rootfs/cos-generator.sh#L29 # See https://github.com/kairos-io/packages/blob/d12b12b043a71d8471454f7b4fc84c3181d2bf60/packages/system/dracut/immutable-rootfs/30cos-immutable-rootfs/cos-generator.sh#L29
{ {
echo "[Unit]" echo "[Unit]"
@ -16,18 +14,6 @@ oem_label=$(getarg rd.cos.oemlabel=)
echo "Before=initrd-fs.target" echo "Before=initrd-fs.target"
echo "Conflicts=initrd-switch-root.target" echo "Conflicts=initrd-switch-root.target"
echo "Requires=initrd-root-fs.target" echo "Requires=initrd-root-fs.target"
if getargbool 0 rd.neednet; then
echo "Wants=network-online.target"
echo "After=network-online.target"
echo "Description=immucore online mount"
else
echo "Description=immucore mount"
fi
# Itxaka: oem is mounted by immucore?
# OEM is special as immucore plugins might need that in order to unlock other partitions and plugins can reside in /oem as well and immucore needs to find them
#if [ -n "${oem_label}" ]; then
# echo "After=oem.mount"
#fi
echo "After=initrd-root-fs.target cos-setup-rootfs.service" echo "After=initrd-root-fs.target cos-setup-rootfs.service"
echo "[Service]" echo "[Service]"
echo "Type=oneshot" echo "Type=oneshot"

13
dracut/28immucore/module-setup.sh
View File

@ -23,18 +23,9 @@ install() {
declare moddir=${moddir} declare moddir=${moddir}
declare systemdutildir=${systemdutildir} declare systemdutildir=${systemdutildir}
declare systemdsystemunitdir=${systemdsystemunitdir} declare systemdsystemunitdir=${systemdsystemunitdir}
declare initdir="${initdir}"
# Add missing elemental binary, drop once we get yip lib inside immucore as its only needed to run the stages # Add missing elemental binary, drop once we get yip lib inside immucore as its only needed to run the stages
inst_multiple \ inst_multiple immucore elemental
immucore elemental inst_script "${moddir}/generator.sh" "${systemdutildir}/system-generators/immucore-generator"
inst_script "${moddir}/generator.sh" \
"${systemdutildir}/system-generators/immucore-generator"
mkdir -p "${initdir}/${systemdsystemunitdir}/initrd-fs.target.requires"
ln_r "../immucore.service" \
"${systemdsystemunitdir}/initrd-fs.target.requires/immucore.service"
dracut_need_initqueue dracut_need_initqueue
} }