···

       
214
       
214
       
 
       
          systemd.services."escaped\\x2ddash".serviceConfig.X-Test = "test";

     

       
215
       
215
       
 
       
        };

     

       
216
       
216
       
 
       


     

       
217
       
217
       
+
       
        unitStartingWithDash.configuration = {

     

       
218
       
218
       
+
       
          systemd.services."-" = {

     

       
219
       
219
       
+
       
            wantedBy = [ "multi-user.target" ];

     

       
220
       
220
       
+
       
            serviceConfig = {

     

       
221
       
221
       
+
       
              Type = "oneshot";

     

       
222
       
222
       
+
       
              RemainAfterExit = true;

     

       
223
       
223
       
+
       
              ExecStart = "${pkgs.coreutils}/bin/true";

     

       
224
       
224
       
+
       
            };

     

       
225
       
225
       
+
       
          };

     

       
226
       
226
       
+
       
        };

     

       
227
       
227
       
+
       


     

       
228
       
228
       
+
       
        unitStartingWithDashModified.configuration = {

     

       
229
       
229
       
+
       
          imports = [ unitStartingWithDash.configuration ];

     

       
230
       
230
       
+
       
          systemd.services."-" = {

     

       
231
       
231
       
+
       
            reloadIfChanged = true;

     

       
232
       
232
       
+
       
            serviceConfig.ExecReload = "${pkgs.coreutils}/bin/true";

     

       
233
       
233
       
+
       
          };

     

       
234
       
234
       
+
       
        };

     

       
235
       
235
       
+
       


     

       
217
       
236
       
 
       
        unitWithRequirement.configuration = {

     

       
218
       
237
       
 
       
          systemd.services.required-service = {

     

       
219
       
238
       
 
       
            wantedBy = [ "multi-user.target" ];

     
···

       
637
       
656
       
 
       
        assert_contains(out, "\nstarting the following units: escaped\\x2ddash.service\n")

     

       
638
       
657
       
 
       
        assert_lacks(out, "the following new units were started:")

     

       
639
       
658
       
 
       


     

       
659
       
659
       
+
       
        # Ensure units can start with a dash

     

       
660
       
660
       
+
       
        out = switch_to_specialisation("${machine}", "unitStartingWithDash")

     

       
661
       
661
       
+
       
        assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n")

     

       
662
       
662
       
+
       
        assert_lacks(out, "NOT restarting the following changed units:")

     

       
663
       
663
       
+
       
        assert_lacks(out, "reloading the following units:")

     

       
664
       
664
       
+
       
        assert_lacks(out, "\nrestarting the following units:")

     

       
665
       
665
       
+
       
        assert_lacks(out, "\nstarting the following units:")

     

       
666
       
666
       
+
       
        assert_contains(out, "the following new units were started: -.service\n")

     

       
667
       
667
       
+
       


     

       
668
       
668
       
+
       
        # The regression only occurs when reloading units

     

       
669
       
669
       
+
       
        out = switch_to_specialisation("${machine}", "unitStartingWithDashModified")

     

       
670
       
670
       
+
       
        assert_lacks(out, "stopping the following units:")

     

       
671
       
671
       
+
       
        assert_lacks(out, "NOT restarting the following changed units:")

     

       
672
       
672
       
+
       
        assert_contains(out, "reloading the following units: -.service")

     

       
673
       
673
       
+
       
        assert_lacks(out, "\nrestarting the following units:")

     

       
674
       
674
       
+
       
        assert_lacks(out, "\nstarting the following units:")

     

       
675
       
675
       
+
       
        assert_lacks(out, "the following new units were started:")

     

       
676
       
676
       
+
       


     

       
640
       
677
       
 
       
        # Ensure units that require changed units are properly reloaded

     

       
641
       
678
       
 
       
        out = switch_to_specialisation("${machine}", "unitWithRequirement")

     

       
642
       
642
       
-
       
        assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n")

     

       
679
       
679
       
+
       
        assert_contains(out, "stopping the following units: -.service\n")

     

       
643
       
680
       
 
       
        assert_lacks(out, "NOT restarting the following changed units:")

     

       
644
       
681
       
 
       
        assert_lacks(out, "reloading the following units:")

     

       
645
       
682
       
 
       
        assert_lacks(out, "\nrestarting the following units:")