Merge pull request #421 from endlessm/T35837-move-systemd-configs

starnight · web-flow · commit 3641cadd4f88 · 2025-06-18T11:22:18.000+08:00
Move EOS systemd downstream configs to eos-boot-helper
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = dracut factory-reset fallback-fb-setup flatpak-repos nvidia psi-monitor record-boot-success . tests
+SUBDIRS = dracut factory-reset fallback-fb-setup flatpak-repos journald locale nvidia psi-monitor record-boot-success . tests
 EXTRA_DIST = debian .flake8 pytest.ini
 CLEANFILES =
 
diff --git a/configure.ac b/configure.ac
@@ -131,6 +131,8 @@ AC_CONFIG_FILES([
 	factory-reset/Makefile
 	fallback-fb-setup/Makefile
 	flatpak-repos/Makefile
+	journald/Makefile
+	locale/Makefile
 	nvidia/Makefile
 	psi-monitor/Makefile
 	record-boot-success/Makefile
diff --git a/journald/Makefile.am b/journald/Makefile.am
@@ -0,0 +1,2 @@
+journaldconfdir = $(sysconfdir)/systemd/journald.conf.d
+dist_journaldconf_DATA = log.conf
diff --git a/journald/log.conf b/journald/log.conf
@@ -0,0 +1,4 @@
+[Journal]
+SystemMaxUse=50M
+SystemMaxFileSize=1M
+RuntimeMaxUse=4M
diff --git a/locale/Makefile.am b/locale/Makefile.am
@@ -0,0 +1,2 @@
+localeconfdir = $(sysconfdir)
+dist_localeconf_DATA = locale.conf
diff --git a/locale/locale.conf b/locale/locale.conf
@@ -0,0 +1 @@
+LANG=en_US.utf8
diff --git a/tmpfiles.d/eos-boot-helper.conf b/tmpfiles.d/eos-boot-helper.conf
@@ -7,3 +7,6 @@ r /var/eos-swap-reclaimed
 # remove stamp file from eos-fix-home-dir-permissions
 # (from 3.1.6 change to default home dir permissions)
 r /var/lib/misc/eos-dir-mode-700
+
+# Store locale info in just 1 place, but add a compat symlink.
+L /etc/default/locale - - - - /etc/locale.conf

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-SUBDIRS = dracut factory-reset fallback-fb-setup flatpak-repos nvidia psi-monitor record-boot-success . tests`
	`1`	`+SUBDIRS = dracut factory-reset fallback-fb-setup flatpak-repos journald locale nvidia psi-monitor record-boot-success . tests`
`2`	`2`	`EXTRA_DIST = debian .flake8 pytest.ini`
`3`	`3`	`CLEANFILES =`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+journaldconfdir = $(sysconfdir)/systemd/journald.conf.d`
	`2`	`+dist_journaldconf_DATA = log.conf`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+localeconfdir = $(sysconfdir)`
	`2`	`+dist_localeconf_DATA = locale.conf`