Skip to content

Commit ccf0b14

Browse files
committed
nixos/timesyncd: remove migration path dating back to 19.09
Also remove the test that only tested this migration and nothing else about systemd-timesyncd.
1 parent 7ccd3bd commit ccf0b14

File tree

3 files changed

+0
-82
lines changed

3 files changed

+0
-82
lines changed

nixos/modules/system/boot/timesyncd.nix

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,6 @@ in
7474
# This means that systemd-timesyncd needs to have NSS modules path in LD_LIBRARY_PATH. When systemd-resolved is disabled we still need to set
7575
# NSS module path so that systemd-timesyncd keeps using other NSS modules that are configured in the system.
7676
environment.LD_LIBRARY_PATH = config.system.nssModules.path;
77-
78-
preStart =
79-
# workaround an issue of systemd-timesyncd not starting due to upstream systemd reverting their dynamic users changes
80-
# - https://github.com/NixOS/nixpkgs/pull/61321#issuecomment-492423742
81-
# - https://github.com/systemd/systemd/issues/12131
82-
lib.optionalString (versionOlder config.system.stateVersion "19.09") ''
83-
if [ -L /var/lib/systemd/timesync ]; then
84-
rm /var/lib/systemd/timesync
85-
mv /var/lib/private/systemd/timesync /var/lib/systemd/timesync
86-
fi
87-
'';
8877
};
8978

9079
environment.etc."systemd/timesyncd.conf".text = ''

nixos/tests/all-tests.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1482,7 +1482,6 @@ in
14821482
systemd-sysusers-immutable = runTest ./systemd-sysusers-immutable.nix;
14831483
systemd-sysusers-mutable = runTest ./systemd-sysusers-mutable.nix;
14841484
systemd-sysusers-password-option-override-ordering = runTest ./systemd-sysusers-password-option-override-ordering.nix;
1485-
systemd-timesyncd = runTest ./systemd-timesyncd.nix;
14861485
systemd-timesyncd-nscd-dnssec = runTest ./systemd-timesyncd-nscd-dnssec.nix;
14871486
systemd-user-linger = runTest ./systemd-user-linger.nix;
14881487
systemd-user-tmpfiles-rules = runTest ./systemd-user-tmpfiles-rules.nix;

nixos/tests/systemd-timesyncd.nix

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)