Try to wait for oem mount instead

This commit is contained in:
Ettore Di Giacinto 2022-11-23 09:44:39 +00:00 committed by Ettore Di Giacinto
parent b3d7b86591
commit 7f397a3459

View File

@ -7,31 +7,29 @@ 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"
if getargbool 0 rd.neednet; then oem_label=$(getarg rd.cos.oemlabel=)
{ neednet="rd.neednet"
echo "[Unit]"
echo "DefaultDependencies=no" # See https://github.com/kairos-io/packages/blob/d12b12b043a71d8471454f7b4fc84c3181d2bf60/packages/system/dracut/immutable-rootfs/30cos-immutable-rootfs/cos-generator.sh#L29
echo "Description=kcrypt online mount" {
echo "Before=cos-immutable-rootfs.service" echo "[Unit]"
echo "After=network-online.target" echo "DefaultDependencies=no"
echo "Description=kcrypt online mount"
echo "Before=cos-immutable-rootfs.service"
if getargbool 0 $neednet; then
echo "Wants=network-online.target" echo "Wants=network-online.target"
echo "[Service]" echo "After=network-online.target"
echo "Type=oneshot" fi
echo "RemainAfterExit=no" # OEM is special as kcrypt plugins might need that in order to unlock other partitions and plugins can reside in /oem as well and kcrypt needs to find them
echo "ExecStart=/sbin/kcrypt-mount-local" if [ -n "${oem_label}" ]; then
} > "$GENERATOR_DIR"/kcrypt.service echo "After=oem.mount"
else fi
{ echo "[Service]"
echo "[Unit]" echo "Type=oneshot"
echo "DefaultDependencies=no" echo "RemainAfterExit=no"
echo "Description=kcrypt mount" echo "ExecStart=/sbin/kcrypt-mount-local"
echo "Before=cos-immutable-rootfs.service" } > "$GENERATOR_DIR"/kcrypt.service
echo "[Service]"
echo "Type=oneshot"
echo "RemainAfterExit=no"
echo "ExecStart=/sbin/kcrypt-mount-local"
} > "$GENERATOR_DIR"/kcrypt.service
fi
if [ ! -e "$GENERATOR_DIR/initrd-fs.target.requires/kcrypt.service" ]; then if [ ! -e "$GENERATOR_DIR/initrd-fs.target.requires/kcrypt.service" ]; then
mkdir -p "$GENERATOR_DIR"/initrd-fs.target.requires mkdir -p "$GENERATOR_DIR"/initrd-fs.target.requires