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

gummiboot-builder.py: Handle the case where there's no /etc/machine-id.

Browse Source 
Bug hit by add^_ in IRC when installing from the livecd, as there's no /mnt/etc/machine-id
This commit is contained in:
Shea Levy 2013-02-12 10:47:52 -05:00
parent 46b7ddf402
commit b669633d63
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import errno
import subprocess import subprocess
import glob import glob
import tempfile import tempfile
import errno
def copy_if_not_exists(source, dest): def copy_if_not_exists(source, dest):
known_paths.append(dest) known_paths.append(dest)
@ -26,7 +27,7 @@ def write_entry(generation, kernel, initrd):
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)
print >> f, "machine-id %s" % (machine_id) if machine_id is not None: print >> f, "machine-id %s" % (machine_id)
print >> f, "linux %s" % (kernel) print >> f, "linux %s" % (kernel)
print >> f, "initrd %s" % (initrd) print >> f, "initrd %s" % (initrd)
print >> f, "options %s" % (kernel_params) print >> f, "options %s" % (kernel_params)
@ -143,8 +144,14 @@ 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")
try:
with open("/etc/machine-id") as machine_file: with open("/etc/machine-id") as machine_file:
machine_id = machine_file.readlines()[0] machine_id = machine_file.readlines()[0]
except IOError as e:
if e.errno != errno.ENOENT:
raise
machine_id = None
gens = get_generations("system") gens = get_generations("system")
for gen in gens: for gen in gens:
add_entry(gen) add_entry(gen)