public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91073 from danielfullmer/systemd-string-format

Browse Source 
nixos/systemd-boot: fix incorrect string formatting
This commit is contained in:
Florian Klink 2020-06-19 02:23:25 +02:00 committed by GitHub
commit a84cbb60f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View File

@ -47,9 +47,9 @@ def write_loader_conf(profile, generation):
if "@timeout@" != "": if "@timeout@" != "":
f.write("timeout @timeout@\n") f.write("timeout @timeout@\n")
if profile: if profile:
f.write("default nixos-%s-generation-%d.conf\n".format(profile, generation)) f.write("default nixos-%s-generation-%d.conf\n" % (profile, generation))
else: else:
f.write("default nixos-generation-%d.conf\n".format(generation)) f.write("default nixos-generation-%d.conf\n" % (generation))
if not @editor@: if not @editor@:
f.write("editor 0\n"); f.write("editor 0\n");
f.write("console-mode @consoleMode@\n"); f.write("console-mode @consoleMode@\n");