commit 3c1c4b65e9eaf68e49113cba5dfe6750596fc86f · pyrox.dev/nixpkgs

+22 -23
nixos/modules/system/boot/timesyncd.nix
···

       46
       46
        
             wantedBy = [ "sysinit.target" ];

     

       47
       47
        
             aliases = [ "dbus-org.freedesktop.timesync1.service" ];

     

       48
       48
        
             restartTriggers = [ config.environment.etc."systemd/timesyncd.conf".source ];

     

       49
       49
       +
       

     

       50
       50
       +
             preStart = (

     

       51
       51
       +
               # Ensure that we have some stored time to prevent

     

       52
       52
       +
               # systemd-timesyncd to resort back to the fallback time.  If

     

       53
       53
       +
               # the file doesn't exist we assume that our current system

     

       54
       54
       +
               # clock is good enough to provide an initial value.

     

       55
       55
       +
               ''

     

       56
       56
       +
                 if ! [ -f /var/lib/systemd/timesync/clock ]; then

     

       57
       57
       +
                   test -d /var/lib/systemd/timesync || mkdir -p /var/lib/systemd/timesync

     

       58
       58
       +
                   touch /var/lib/systemd/timesync/clock

     

       59
       59
       +
                 fi

     

       60
       60
       +
               '' +

     

       61
       61
       +
               # workaround an issue of systemd-timesyncd not starting due to upstream systemd reverting their dynamic users changes

     

       62
       62
       +
               #  - https://github.com/NixOS/nixpkgs/pull/61321#issuecomment-492423742

     

       63
       63
       +
               #  - https://github.com/systemd/systemd/issues/12131

     

       64
       64
       +
               (lib.optionalString (versionOlder config.system.stateVersion "19.09") ''

     

       65
       65
       +
                 if [ -L /var/lib/systemd/timesync ]; then

     

       66
       66
       +
                   rm /var/lib/systemd/timesync

     

       67
       67
       +
                   mv /var/lib/private/systemd/timesync /var/lib/systemd/timesync

     

       68
       68
       +
                 fi

     

       69
       69
       +
               '')

     

       70
       70
       +
             );

     

       49
       71
        
           };

     

       50
       72
        
       

     

       51
       73
        
           environment.etc."systemd/timesyncd.conf".text = ''

     
···

       59
       81
        
             group = "systemd-timesync";

     

       60
       82
        
           };

     

       61
       83
        
           users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync;

     

       62
       62
       -
       

     

       63
       63
       -
           system.activationScripts.systemd-timesyncd-migration =

     

       64
       64
       -
             # workaround an issue of systemd-timesyncd not starting due to upstream systemd reverting their dynamic users changes

     

       65
       65
       -
             #  - https://github.com/NixOS/nixpkgs/pull/61321#issuecomment-492423742

     

       66
       66
       -
             #  - https://github.com/systemd/systemd/issues/12131

     

       67
       67
       -
             mkIf (versionOlder config.system.stateVersion "19.09") ''

     

       68
       68
       -
               if [ -L /var/lib/systemd/timesync ]; then

     

       69
       69
       -
                 rm /var/lib/systemd/timesync

     

       70
       70
       -
                 mv /var/lib/private/systemd/timesync /var/lib/systemd/timesync

     

       71
       71
       -
               fi

     

       72
       72
       -
             '';

     

       73
       73
       -
           system.activationScripts.systemd-timesyncd-init-clock =

     

       74
       74
       -
             # Ensure that we have some stored time to prevent systemd-timesyncd to

     

       75
       75
       -
             # resort back to the fallback time.

     

       76
       76
       -
             # If the file doesn't exist we assume that our current system clock is

     

       77
       77
       -
             # good enough to provide an initial value.

     

       78
       78
       -
             ''

     

       79
       79
       -
             if ! [ -f /var/lib/systemd/timesync/clock ]; then

     

       80
       80
       -
               test -d /var/lib/systemd/timesync || mkdir -p /var/lib/systemd/timesync

     

       81
       81
       -
               touch /var/lib/systemd/timesync/clock

     

       82
       82
       -
             fi

     

       83
       83
       -
             '';

     

       84
       84
        
         };

     

       85
       85
       -
       

     

       86
       85
        
       }