Skip to content

Commit

Permalink
fix(systemd): systemd-vconsole-setup has a dependency on loadkeys
Browse files Browse the repository at this point in the history
loadkeys is installed by 10i18n dracut module.
  • Loading branch information
jozzsi authored and Conan-Kudo committed Aug 28, 2024
1 parent bd3c1e1 commit 5551746
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions modules.d/00systemd/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ install() {
"$systemdutildir"/systemd-shutdown \
"$systemdutildir"/systemd-reply-password \
"$systemdutildir"/systemd-fsck \
"$systemdutildir"/systemd-vconsole-setup \
"$systemdutildir"/systemd-volatile-root \
"$systemdutildir"/systemd-sysroot-fstab-check \
"$systemdutildir"/system-generators/systemd-debug-generator \
Expand Down Expand Up @@ -79,7 +78,6 @@ install() {
"$systemdsystemunitdir"/systemd-reboot.service \
"$systemdsystemunitdir"/systemd-kexec.service \
"$systemdsystemunitdir"/systemd-fsck@.service \
"$systemdsystemunitdir"/systemd-vconsole-setup.service \
"$systemdsystemunitdir"/systemd-volatile-root.service \
"$systemdsystemunitdir"/ctrl-alt-del.target \
"$systemdsystemunitdir"/syslog.socket \
Expand Down Expand Up @@ -154,14 +152,18 @@ EOF
90-vconsole.rules \
99-systemd.rules

for i in \
emergency.target \
rescue.target; do
[[ -f "$systemdsystemunitdir"/$i ]] || continue
if [ -e "$systemdsystemunitdir"/systemd-vconsole-setup.service ]; then
if dracut_module_included "10i18n" && [[ -e "$systemdsystemunitdir"/systemd-vconsole-setup.service ]]; then
inst_multiple -o \
"$systemdutildir"/systemd-vconsole-setup \
"$systemdsystemunitdir"/systemd-vconsole-setup.service

for i in \
emergency.target \
rescue.target; do
[[ -f "$systemdsystemunitdir"/$i ]] || continue
$SYSTEMCTL -q --root "$initdir" add-wants "$i" systemd-vconsole-setup.service
fi
done
done
fi

mkdir -p "$initdir/etc/systemd"

Expand Down

0 comments on commit 5551746

Please sign in to comment.