From ba11c40e495b8c6278a3ff801cc11065a135c289 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Wed, 8 Jun 2022 11:38:52 +0300 Subject: configs/: use the C.UTF-8 locale The glibc 2.35-6 package ships with the C.UTF-8 locale included. This means there is now a UTF-8 locale available by default and en_US.UTF-8, which requires editing /etc/locale.gen and running locale-gen, is not needed anymore. Implements #175. --- configs/releng/airootfs/etc/locale.conf | 2 +- .../releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook (limited to 'configs/releng/airootfs') diff --git a/configs/releng/airootfs/etc/locale.conf b/configs/releng/airootfs/etc/locale.conf index 01ec548..f9c983c 100644 --- a/configs/releng/airootfs/etc/locale.conf +++ b/configs/releng/airootfs/etc/locale.conf @@ -1 +1 @@ -LANG=en_US.UTF-8 +LANG=C.UTF-8 diff --git a/configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook b/configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook deleted file mode 100644 index 82dd199..0000000 --- a/configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook +++ /dev/null @@ -1,13 +0,0 @@ -# remove from airootfs! -[Trigger] -Operation = Install -Type = Package -Target = glibc - -[Action] -Description = Uncommenting en_US.UTF-8 locale and running locale-gen... -When = PostTransaction -Depends = glibc -Depends = sed -Depends = sh -Exec = /bin/sh -c "sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen && locale-gen" -- cgit v1.2.3-70-g09d2 From ced3d3ffa384600012618612c98476a231f5fb89 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Sun, 7 Aug 2022 15:59:52 +0300 Subject: Order pacman-init.service before archlinux-keyring-wkd-sync.service archlinux-keyring-wkd-sync.service needs an initialized pacman keyring to work. Add BindsTo=etc-pacman.d-gnupg.mount to stop pacman-init.service if the mount unit suddenly enters inactive state. --- CHANGELOG.rst | 3 +++ configs/releng/airootfs/etc/systemd/system/pacman-init.service | 2 ++ 2 files changed, 5 insertions(+) (limited to 'configs/releng/airootfs') diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a4ca833..5766eb2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,9 @@ Added Changed ------- +- Order ``pacman-init.service`` before ``archlinux-keyring-wkd-sync.service`` since + ``archlinux-keyring-wkd-sync.service`` needs an initialized pacman keyring. + Removed ------- diff --git a/configs/releng/airootfs/etc/systemd/system/pacman-init.service b/configs/releng/airootfs/etc/systemd/system/pacman-init.service index b18f7f8..9ad2e69 100644 --- a/configs/releng/airootfs/etc/systemd/system/pacman-init.service +++ b/configs/releng/airootfs/etc/systemd/system/pacman-init.service @@ -2,6 +2,8 @@ Description=Initializes Pacman keyring Requires=etc-pacman.d-gnupg.mount After=etc-pacman.d-gnupg.mount +BindsTo=etc-pacman.d-gnupg.mount +Before=archlinux-keyring-wkd-sync.service [Service] Type=oneshot -- cgit v1.2.3-70-g09d2 From 69b22dc41f8b367fa2d49af6331699bb2dcda4f8 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sun, 25 Sep 2022 15:36:18 +0200 Subject: Enable systemd-timesyncd and systemd-time-wait-sync configs/releng/airootfs/etc/systemd/system/{dbus-org.freedesktop.timesync1},sysinit.target.wants/systemd-timesyncd}.service: Enable systemd-timesyncd which aliases to dbus-org.freedesktop.timesync1 to ensure time gets synced on the host. configs/releng/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service: Enable systemd-time-wait-sync to ensure time is finished syncing when time-sync.target is finished. --- .../airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service | 1 + .../systemd/system/sysinit.target.wants/systemd-time-wait-sync.service | 1 + .../etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service | 1 + 3 files changed, 3 insertions(+) create mode 120000 configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service create mode 120000 configs/releng/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service create mode 120000 configs/releng/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service (limited to 'configs/releng/airootfs') diff --git a/configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service b/configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service new file mode 120000 index 0000000..cd00411 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-timesyncd.service \ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service b/configs/releng/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service new file mode 120000 index 0000000..cabf28b --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-time-wait-sync.service \ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service b/configs/releng/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service new file mode 120000 index 0000000..cd00411 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-timesyncd.service \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 3f55c95613ac55f765d1767c2878043a67e803f6 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sun, 25 Sep 2022 15:39:28 +0200 Subject: Order pacman-init.service after time-sync.target configs/releng/airootfs/etc/systemd/system/pacman-init.service: Order pacman-init.service after time-sync.target, so that time on the host is synchronized before initializing pacman. --- configs/releng/airootfs/etc/systemd/system/pacman-init.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs/releng/airootfs') diff --git a/configs/releng/airootfs/etc/systemd/system/pacman-init.service b/configs/releng/airootfs/etc/systemd/system/pacman-init.service index 9ad2e69..b824884 100644 --- a/configs/releng/airootfs/etc/systemd/system/pacman-init.service +++ b/configs/releng/airootfs/etc/systemd/system/pacman-init.service @@ -1,7 +1,7 @@ [Unit] Description=Initializes Pacman keyring Requires=etc-pacman.d-gnupg.mount -After=etc-pacman.d-gnupg.mount +After=etc-pacman.d-gnupg.mount time-sync.target BindsTo=etc-pacman.d-gnupg.mount Before=archlinux-keyring-wkd-sync.service -- cgit v1.2.3-70-g09d2