Merge staging-next into staging

2019-08-31 10:04:20 +02:00
parent ebe4fd146b fc74ba8291
commit ad1d58c622
364 changed files with 8970 additions and 6854 deletions
@@ -70,8 +70,6 @@ in

      systemd.services.softether-init = {
        description = "SoftEther VPN services initial task";
-        after = [ "keys.target" ];
-        wants = [ "keys.target" ];
        wantedBy = [ "network.target" ];
        serviceConfig = {
          Type = "oneshot";