particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

image-info: sort bootmenu entries

Browse source 
The order doesn't matter, but should be the same between different runs
of image-info.
This commit is contained in:
Lars Karlitski 2019-10-03 12:49:28 +02:00 • committed by Tom Gundersen
parent 4dbba6398a
commit 5040e6b427
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tools/image-info
View file

@ -88,9 +88,13 @@ def read_bootloader_type(device):
return "unknown"
def read_bls_conf(filename):
with open(filename) as f:
return dict(line.strip().split(" ", 1) for line in f)
def read_boot_entries(boot_dir):
entries = []
for conf in glob.glob(f"{boot_dir}/loader/entries/*.conf"):
with open(conf) as f:
entries.append(dict(line.strip().split(" ", 1) for line in f))
return sorted(entries, key=lambda e: e["title"])
def rpm_verify(tree):
@ -143,11 +147,11 @@ with nbd_connect(image) as device:
if os.path.exists(f"{tree}/boot") and len(os.listdir(f"{tree}/boot")) > 0:
assert "bootmenu" not in report
report["bootmenu"] = [read_bls_conf(f) for f in glob.glob(f"{tree}/boot/loader/entries/*.conf")]
report["bootmenu"] = read_boot_entries(f"{tree}/boot")
elif len(glob.glob(f"{tree}/vmlinuz-*")) > 0:
assert "bootmenu" not in report
report["bootmenu"] = [read_bls_conf(f) for f in glob.glob(f"{tree}/loader/entries/*.conf")]
report["bootmenu"] = read_boot_entries(tree)
json.dump(report, sys.stdout, sort_keys=True, indent=2)