commit 57840dbffb38d6717130bf446935beff5bb12dfe · pyrox.dev/nixpkgs

+7 -6
nixos/modules/services/system/cloud-init.nix
···

       104
       104
        
           systemd.services.cloud-init =

     

       105
       105
        
             { description = "Initial cloud-init job (metadata service crawler)";

     

       106
       106
        
               wantedBy = [ "multi-user.target" ];

     

       107
       107
       -
               wants = [ "local-fs.target" "cloud-init-local.service" "sshd.service" "sshd-keygen.service" ];

     

       108
       108
       -
               after = [ "local-fs.target" "network.target" "cloud-init-local.service" ];

     

       107
       107
       +
               wants = [ "local-fs.target" "network-online.target" "cloud-init-local.service"

     

       108
       108
       +
                         "sshd.service" "sshd-keygen.service" ];

     

       109
       109
       +
               after = [ "local-fs.target" "network-online.target" "cloud-init-local.service" ];

     

       109
       110
        
               before = [ "sshd.service" "sshd-keygen.service" ];

     

       110
       111
        
               requires = [ "network.target "];

     

       111
       112
        
               path = path;

     
···

       121
       122
        
           systemd.services.cloud-config =

     

       122
       123
        
             { description = "Apply the settings specified in cloud-config";

     

       123
       124
        
               wantedBy = [ "multi-user.target" ];

     

       124
       124
       -
               wants = [ "network.target" ];

     

       125
       125
       -
               after = [ "network.target" "syslog.target" "cloud-config.target" ];

     

       125
       125
       +
               wants = [ "network-online.target" ];

     

       126
       126
       +
               after = [ "network-online.target" "syslog.target" "cloud-config.target" ];

     

       126
       127
        
       

     

       127
       128
        
               path = path;

     

       128
       129
        
               serviceConfig =

     
···

       137
       138
        
           systemd.services.cloud-final =

     

       138
       139
        
             { description = "Execute cloud user/final scripts";

     

       139
       140
        
               wantedBy = [ "multi-user.target" ];

     

       140
       140
       -
               wants = [ "network.target" ];

     

       141
       141
       -
               after = [ "network.target" "syslog.target" "cloud-config.service" "rc-local.service" ];

     

       141
       141
       +
               wants = [ "network-online.target" ];

     

       142
       142
       +
               after = [ "network-online.target" "syslog.target" "cloud-config.service" "rc-local.service" ];

     

       142
       143
        
               requires = [ "cloud-config.target" ];

     

       143
       144
        
               path = path;

     

       144
       145
        
               serviceConfig =