diff --git a/mkosi.extra/usr/lib/systemd/system-generators/kde-linux-mount-generator b/mkosi.extra/usr/lib/systemd/system-generators/kde-linux-mount-generator index df493a9..270971c 100755 --- a/mkosi.extra/usr/lib/systemd/system-generators/kde-linux-mount-generator +++ b/mkosi.extra/usr/lib/systemd/system-generators/kde-linux-mount-generator @@ -10,7 +10,9 @@ set -eux . /usr/lib/os-release normal_dir=$1 +# shellcheck disable=SC2034 early_dir=$2 +# shellcheck disable=SC2034 late_dir=$3 exec >/dev/kmsg 2>&1 @@ -21,7 +23,7 @@ if grep "kde-linux.live=1" /proc/cmdline; then fi if [ "$SYSTEMD_IN_INITRD" = "1" ]; then - # --- Initrd phase: generate system mounts for transition and usr linking --- + # --- Initrd phase: generate system mounts for transition (if needed) and usr linking --- cat <<- EOF > "$late_dir/kde-linux-rootfs-transition.service" # Generated by $(basename "$0") @@ -33,6 +35,7 @@ Requires=systemd-fsck-root.service After=systemd-fsck-root.service Before=sysroot.mount After=blockdev@dev-gpt\x2dauto\x2droot.target +# Let vconsole-setup do its setup before starting user interaction: After=systemd-vconsole-setup.service [Service] @@ -84,7 +87,7 @@ EOF mkdir "$normal_dir/initrd-usr-fs.target.requires/" || true ln -s ../sysusr-usr.mount "$normal_dir/initrd-usr-fs.target.requires/sysusr-usr.mount" - # Bind /sysusr/usr to /sysroot/usr + # The usr bound from /sysusr/usr to /sysroot/usr (this mimics systemd's generator behavior) cat <<- EOF > "$normal_dir/sysroot-usr.mount" # Generated by $(basename "$0")