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

gummiboot-builder: Only read /etc/machine-id once per invocation

Browse Source
This commit is contained in:
Shea Levy 2013-02-02 21:16:12 -05:00
parent d57df55566
commit 36088abb39
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,8 +23,6 @@ def write_entry(generation, kernel, initrd):
kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir) kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir)
with open("%s/kernel-params" % (generation_dir)) as params_file: with open("%s/kernel-params" % (generation_dir)) as params_file:
kernel_params = kernel_params + params_file.read() kernel_params = kernel_params + params_file.read()
with open("/etc/machine-id") as machine_file:
machine_id = machine_file.readlines()[0]
with open(tmp_path, 'w') as f: with open(tmp_path, 'w') as f:
print >> f, "title NixOS" print >> f, "title NixOS"
print >> f, "version Generation %d" % (generation) print >> f, "version Generation %d" % (generation)
@ -145,6 +143,8 @@ args = parser.parse_args()
known_paths = [] known_paths = []
mkdir_p("@efiSysMountPoint@/efi/nixos") mkdir_p("@efiSysMountPoint@/efi/nixos")
mkdir_p("@efiSysMountPoint@/loader/entries") mkdir_p("@efiSysMountPoint@/loader/entries")
with open("/etc/machine-id") as machine_file:
machine_id = machine_file.readlines()[0]
gens = get_generations("system") gens = get_generations("system")
for gen in gens: for gen in gens:
add_entry(gen) add_entry(gen)