diff --git a/srcpkgs/systemd/files/vconsole.conf b/srcpkgs/systemd/files/vconsole.conf index 72e2e48cf37..2c3e9f59866 100644 --- a/srcpkgs/systemd/files/vconsole.conf +++ b/srcpkgs/systemd/files/vconsole.conf @@ -1,17 +1,17 @@ # systemd virtual console configuration file for Void GNU/Linux. # # To choose your system keymap. -# All keymaps are available in /lib/kbd/keymaps. +# All keymaps are available in /usr/share/kbd/keymaps. KEYMAP=us # To choose your system font. -# All fonts are available in /lib/kbd/consolefonts. +# All fonts are available in /usr/share/kbd/consolefonts. FONT=lat9w-16 # To choose your system charset map. -# All charset maps are available in /lib/kbd/consoletrans. +# All charset maps are available in /usr/share/kbd/consoletrans. #FONT_MAP=latin2u # To choose your system unicode map. -# All unicode maps are available in /lib/kbd/unimaps. +# All unicode maps are available in /usr/share/kbd/unimaps. #FONT_UNIMAP=lat9w diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template index 3e3390b5136..48c6e4c18a2 100644 --- a/srcpkgs/systemd/template +++ b/srcpkgs/systemd/template @@ -1,7 +1,7 @@ # Template file for 'systemd' pkgname=systemd version=43 -revision=1 +revision=2 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--with-distro=other --with-rootprefix= @@ -42,6 +42,7 @@ make_dirs=" Add_dependency run dbus Add_dependency run run-parts +Add_dependency run kbd ">=1.15.3_5" # switched to /usr. Add_dependency build pkg-config Add_dependency build intltool @@ -61,8 +62,8 @@ Add_dependency build libkmod-devel Add_dependency build liblzma-devel pre_configure() { - sed -i -e "s|/bin/loadkeys|/sbin/loadkeys|g" Makefile.in - sed -i -e "s|/bin/setfont|/sbin/setfont|g" Makefile.in + sed -i -e "s|/bin/loadkeys|/usr/bin/loadkeys|g" Makefile.in + sed -i -e "s|/bin/setfont|/usr/bin/setfont|g" Makefile.in } post_install() {