[systemd-devel] [PATCH] vconsole-setup: fix path on Arch
Lucas De Marchi
lucas.demarchi at profusion.mobi
Thu Oct 7 10:00:23 PDT 2010
Arch uses the same paths and default font of gentoo. Previously,
systemd-vconsole-setup was failing with the following message:
systemd-vconsole-setup[59]: /bin/setfont failed with error code 1.
---
Makefile.am | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 4307db1..4b248c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,11 +61,18 @@ AM_CPPFLAGS += \
-DKBD_SETFONT=\"/usr/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
else
+if TARGET_ARCH
+AM_CPPFLAGS += \
+ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+ -DKBD_SETFONT=\"/usr/bin/setfont\" \
+ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
-DDEFAULT_FONT=\"latarcyrheb-sun16\"
endif
+endif
rootbin_PROGRAMS = \
systemd \
--
1.7.3.1
More information about the systemd-devel
mailing list