alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #150922 from ncfavier/systemd-tzdir

Browse source 
nixos/systemd: set TZDIR for PID 1
This commit is contained in:
Florian Klink 2021-12-22 11:52:27 +01:00 committed by GitHub
parent 5604ce4fb7 901d4f13a3
commit 60e571fa40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/system/boot/stage-2-init.sh Normal file → Executable file
View file

@ -172,4 +172,5 @@ echo "starting systemd..."
PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \ PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \
LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive @systemdUnitPathEnvVar@ \ LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive @systemdUnitPathEnvVar@ \
TZDIR=/etc/zoneinfo \
exec @systemdExecutable@ exec @systemdExecutable@

12
nixos/tests/systemd.nix
View file

@ -31,6 +31,13 @@ import ./make-test-python.nix ({ pkgs, ... }: {
umount /tmp/shared umount /tmp/shared
''; '';
systemd.services.oncalendar-test = {
description = "calendar test";
# Japan does not have DST which makes the test a little bit simpler
startAt = "Wed 10:00 Asia/Tokyo";
script = "true";
};
systemd.services.testservice1 = { systemd.services.testservice1 = {
description = "Test Service 1"; description = "Test Service 1";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@ -69,6 +76,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
# wait for user services # wait for user services
machine.wait_for_unit("default.target", "alice") machine.wait_for_unit("default.target", "alice")
# Regression test for https://github.com/NixOS/nixpkgs/issues/105049
with subtest("systemd reads timezone database in /etc/zoneinfo"):
timer = machine.succeed("TZ=UTC systemctl show --property=TimersCalendar oncalendar-test.timer")
assert re.search("next_elapse=Wed ....-..-.. 01:00:00 UTC", timer), f"got {timer.strip()}"
# Regression test for https://github.com/NixOS/nixpkgs/issues/35415 # Regression test for https://github.com/NixOS/nixpkgs/issues/35415
with subtest("configuration files are recognized by systemd"): with subtest("configuration files are recognized by systemd"):
machine.succeed("test -e /system_conf_read") machine.succeed("test -e /system_conf_read")