systemd: Add config files for locale and vconsole.

I also cleaned up the package und add more comments to the NM file.

diff --git a/pkgs/systemd/locale.conf b/pkgs/systemd/locale.conf
new file mode 100644 (file)
index 0000000..ab255a0
--- /dev/null
+++ b/pkgs/systemd/locale.conf
@@ -0,0 +1,2 @@
+LANG=en_us.UTF-8
+LC_MESSAGES=C

diff --git a/pkgs/systemd/systemd.nm b/pkgs/systemd/systemd.nm
index 4105734c56837471d886b0dc3bf5dda3c4a5a07b..13001ba24349c291b9f4ec4e0aba1440ec30da93 100644 (file)
--- a/pkgs/systemd/systemd.nm
+++ b/pkgs/systemd/systemd.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = systemd
 PKG_VER        = 28
-PKG_REL        = 1
+PKG_REL        = 2
 
 PKG_MAINTAINER = Stefan Schantl <stefan.schantl@ipfire.org>
 PKG_GROUPS     = System/Base
@@ -94,14 +94,21 @@ define STAGE_INSTALL_CMDS
        # Create empty machine-id file.
        touch $(BUILDROOT)/etc/machine-id
 
+       # Copy locale and console settings
+       -mkdir -pv $(BUILDROOT)/etc
+       cp -vf $(DIR_SOURCE)/locale.conf $(BUILDROOT)/etc/
+       cp -vf $(DIR_SOURCE)/vconsole.conf $(BUILDROOT)/etc/
+
+       # Recreate all targets
        rm -rfv $(BUILDROOT)/etc/systemd/system/*.target.wants
        -mkdir -pv $(BUILDROOT)/lib/systemd/system/basic.target.wants
        -mkdir -pv $(BUILDROOT)/lib/systemd/system/default.target.wants
         -mkdir -pv $(BUILDROOT)/lib/systemd/system/dbus.target.wants
         -mkdir -pv $(BUILDROOT)/lib/systemd/system/syslog.target.wants
        
-       # Remove runlevel targets
+       # Remove runlevel targets and graphical.target
        rm -rfv $(BUILDROOT)/lib/systemd/system/runlevel*
+       rm -rfv $(BUILDROOT)/lib/systemd/system/graphical.target
 
        # Set default target to multi-user
        cd $(BUILDROOT)/lib/systemd/system && ln -svf multi-user.target default.target
@@ -114,6 +121,11 @@ define STAGE_INSTALL_CMDS
        cd $(BUILDROOT)/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/sockets.target sockets.target
        cd $(BUILDROOT)/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/sound.target sound.target
        cd $(BUILDROOT)/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/swap.target swap.target
+       
+       # Remove tmpfile for X11
+       rm -rfv $(BUILDROOT)/usr/lib/tmpfiles.d/x11.conf
 
-       ln -svf ../../systemd/user $(BUILDROOT)/etc/xdg/systemd/user
+       # Remove unneeded symlink for xdg
+       rm -rfv $(BUILDROOT)/etc/xdg/systemd
 endef
+

diff --git a/pkgs/systemd/vconsole.conf b/pkgs/systemd/vconsole.conf
new file mode 100644 (file)
index 0000000..4eff1d3
--- /dev/null
+++ b/pkgs/systemd/vconsole.conf
@@ -0,0 +1,2 @@
+KEYMAP=us
+FONT=latarcyrheb-sun16