Merge branch 'master' into staging-next

Conflicts: gobby and libinfinity - I took the hand-edited versions instead of those resuting from the mass-replacement. Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
parent 34baf00b72 249ba3d3ed
commit 5b0398dc36
70 changed files with 1689 additions and 473 deletions
@@ -42,7 +42,7 @@ def write_loader_conf(profile, generation):
        else:
            f.write("default nixos-generation-%d\n" % (generation))
        if not @editor@:
-            f.write("editor 0");
+            f.write("editor 0\n");
        f.write("console-mode @consoleMode@\n");
    os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf")