From dad35814411020baee844d4bd75e8d267cd8c869 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 10 Jan 2020 12:03:23 +0100 Subject: [PATCH] kernel-overlays: move volatile runtime data to /run Create the module and firmware symlink trees in /run/kernel-overlays instead of /var/lib as recommended by FHS 3.0. This also allows us to drop the After=var.mount ordering in the systemd service. Signed-off-by: Matthias Reichl --- packages/sysutils/systemd/scripts/kernel-overlays-setup | 5 +++-- packages/sysutils/systemd/system.d/kernel-overlays.service | 1 - scripts/image | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/sysutils/systemd/scripts/kernel-overlays-setup b/packages/sysutils/systemd/scripts/kernel-overlays-setup index 67c5ca26f6..db36ff0896 100755 --- a/packages/sysutils/systemd/scripts/kernel-overlays-setup +++ b/packages/sysutils/systemd/scripts/kernel-overlays-setup @@ -6,8 +6,9 @@ SYSTEM_OVERLAYS_DIR=/usr/lib/kernel-overlays OVERLAY_CONFIG_DIR=/storage/.cache/kernel-overlays KVER=$(uname -r) -MODULES_DIR="/var/lib/modules/${KVER}" -FIRMWARE_DIR="/var/lib/firmware" +RUNTIME_DIR="/run/kernel-overlays" +MODULES_DIR="${RUNTIME_DIR}/modules/${KVER}" +FIRMWARE_DIR="${RUNTIME_DIR}/firmware" USER_FIRMWARE_DIR="/storage/.config/firmware" mkdir -p "${MODULES_DIR}" diff --git a/packages/sysutils/systemd/system.d/kernel-overlays.service b/packages/sysutils/systemd/system.d/kernel-overlays.service index 5d771ac3a0..726ec8e3b8 100644 --- a/packages/sysutils/systemd/system.d/kernel-overlays.service +++ b/packages/sysutils/systemd/system.d/kernel-overlays.service @@ -1,7 +1,6 @@ [Unit] Description=Create kernel modules tree from overlays DefaultDependencies=no -After=var.mount Before=systemd-udevd.service systemd-udev-trigger.service systemd-modules-load.service systemd-remount-fs.service swap.service machine-id.service kmod-static-nodes.service [Service] diff --git a/scripts/image b/scripts/image index 72512df6aa..deb038426e 100755 --- a/scripts/image +++ b/scripts/image @@ -217,10 +217,10 @@ for MOD in $(find ${INSTALL}/usr/lib/kernel-overlays/ -type f -name *.ko); do done # Symlink overlayed modules to /usr/lib/modules -ln -sT /var/lib/modules ${INSTALL}/usr/lib/modules +ln -sT /run/kernel-overlays/modules ${INSTALL}/usr/lib/modules # Symlink overlayed firmware to /usr/lib/firmware -ln -sT /var/lib/firmware ${INSTALL}/usr/lib/firmware +ln -sT /run/kernel-overlays/firmware ${INSTALL}/usr/lib/firmware # Make target dir mkdir -p ${TARGET_IMG}