mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-20 12:43:52 +00:00
4f0dadbf38
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
68 lines
2.2 KiB
Nix
68 lines
2.2 KiB
Nix
# Regression test for systemd-timesync having moved the state directory without
|
|
# upstream providing a migration path. https://github.com/systemd/systemd/issues/12131
|
|
|
|
import ./make-test-python.nix (
|
|
let
|
|
common =
|
|
{ lib, ... }:
|
|
{
|
|
# override the `false` value from the qemu-vm base profile
|
|
services.timesyncd.enable = lib.mkForce true;
|
|
};
|
|
mkVM = conf: {
|
|
imports = [
|
|
conf
|
|
common
|
|
];
|
|
};
|
|
in
|
|
{
|
|
name = "systemd-timesyncd";
|
|
nodes = {
|
|
current = mkVM { };
|
|
pre1909 = mkVM (
|
|
{ lib, ... }:
|
|
{
|
|
# create the path that should be migrated by our activation script when
|
|
# upgrading to a newer nixos version
|
|
system.stateVersion = "19.03";
|
|
systemd.tmpfiles.settings.systemd-timesyncd-test = {
|
|
"/var/lib/systemd/timesync".R = { };
|
|
"/var/lib/systemd/timesync".L.argument = "/var/lib/private/systemd/timesync";
|
|
"/var/lib/private/systemd/timesync".d = {
|
|
user = "systemd-timesync";
|
|
group = "systemd-timesync";
|
|
};
|
|
};
|
|
}
|
|
);
|
|
};
|
|
|
|
testScript = ''
|
|
start_all()
|
|
current.succeed("systemctl status systemd-timesyncd.service")
|
|
# on a new install with a recent systemd there should not be any
|
|
# leftovers from the dynamic user mess
|
|
current.succeed("test -e /var/lib/systemd/timesync")
|
|
current.succeed("test ! -L /var/lib/systemd/timesync")
|
|
|
|
# timesyncd should be running on the upgrading system since we fixed the
|
|
# file bits in the activation script
|
|
pre1909.succeed("systemctl status systemd-timesyncd.service")
|
|
|
|
# the path should be gone after the migration
|
|
pre1909.succeed("test ! -e /var/lib/private/systemd/timesync")
|
|
|
|
# and the new path should no longer be a symlink
|
|
pre1909.succeed("test -e /var/lib/systemd/timesync")
|
|
pre1909.succeed("test ! -L /var/lib/systemd/timesync")
|
|
|
|
# after a restart things should still work and not fail in the activation
|
|
# scripts and cause the boot to fail..
|
|
pre1909.shutdown()
|
|
pre1909.start()
|
|
pre1909.succeed("systemctl status systemd-timesyncd.service")
|
|
'';
|
|
}
|
|
)
|