Dracut: use inst_rules to install udev rules (#359)

image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/google-nvme-disk.service

@@ -1,15 +0,0 @@
-[Unit]
-Description=Force symlink creation for GCP nvme disks
-Before=prepare-state-disk.service
-After=network-online.target
-Wants=network-online.target
-ConditionKernelCommandLine=constel.csp=gcp
-
-[Service]
-Type=oneshot
-ExecStart=/bin/bash /usr/sbin/google-nvme-disk
-RemainAfterExit=yes
-StandardOutput=tty
-StandardInput=tty
-StandardError=tty
-TimeoutSec=infinity

image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/google-nvme-disk.sh

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) Edgeless Systems GmbH
-#
-# SPDX-License-Identifier: AGPL-3.0-only
-
-set -euo pipefail
-shopt -s extglob nullglob
-
-GCP_STATE_DISK_SYMLINK="/dev/disk/by-id/google-state-disk"
-
-# hack: google nvme udev rules are never executed. Create symlinks for the nvme devices manually.
-while [ ! -L "${GCP_STATE_DISK_SYMLINK}" ]
-do
-    for nvmedisk in /dev/nvme0n+([0-9])
-    do
-        /usr/lib/udev/google_nvme_id -s -d "${nvmedisk}" || true
-    done
-    if [ -L "${GCP_STATE_DISK_SYMLINK}" ]; then
-        break
-    fi
-    echo "Waiting for state disk to appear.."
-    sleep 2
-done
-
-echo "Google state disk found"
-echo ${GCP_STATE_DISK_SYMLINK} → $(readlink -f "${GCP_STATE_DISK_SYMLINK}")
-sleep 2

image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/module-setup.sh

@@ -26,10 +26,6 @@ install() {
         "/usr/sbin/prepare-state-disk"
     install_and_enable_unit "prepare-state-disk.service" \
         "basic.target"
-    inst_script "$moddir/google-nvme-disk.sh" \
-        "/usr/sbin/google-nvme-disk"
-    install_and_enable_unit "google-nvme-disk.service" \
-        "basic.target"
     install_and_enable_unit "configure-constel-csp.service" \
         "basic.target"
 
@@ -57,10 +53,7 @@ install() {
         "/usr/sbin/nvme"
     inst_script "/usr/lib/udev/google_nvme_id" \
         "/usr/lib/udev/google_nvme_id"
-    inst_simple "/usr/lib/udev/rules.d/64-gce-disk-removal.rules" \
+    inst_rules "64-gce-disk-removal.rules" "65-gce-disk-naming.rules"
-        "/usr/lib/udev/rules.d/64-gce-disk-removal.rules"
-    inst_simple "/usr/lib/udev/rules.d/65-gce-disk-naming.rules" \
-        "/usr/lib/udev/rules.d/65-gce-disk-naming.rules"
 
     inst_script "$moddir/aws-nvme-disk.sh" \
         "/usr/sbin/aws-nvme-disk"