2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Use UUIDs instead of labels in build-ufd

Browse source 
* Addresses issue #138
This commit is contained in:
2Shirt 2020-01-13 16:48:00 -07:00
parent 24a2e60f02
commit e355fb1316
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/wk/kit/ufd.py
View file

@ -15,6 +15,7 @@ from wk import io, log, std
from wk.cfg.main import KIT_NAME_FULL, KIT_NAME_SHORT from wk.cfg.main import KIT_NAME_FULL, KIT_NAME_SHORT
from wk.cfg.ufd import BOOT_ENTRIES, BOOT_FILES, ITEMS, ITEMS_HIDDEN, SOURCES from wk.cfg.ufd import BOOT_ENTRIES, BOOT_FILES, ITEMS, ITEMS_HIDDEN, SOURCES
from wk.exe import run_program from wk.exe import run_program
from wk.hw.obj import Disk
from wk.os import linux from wk.os import linux
@ -391,6 +392,8 @@ def show_selections(args, sources, ufd_dev, ufd_sources):
def update_boot_entries(): def update_boot_entries():
"""Update boot files for UFD usage""" """Update boot files for UFD usage"""
configs = [] configs = []
ufd = Disk('/mnt/UFD')
uuid = ufd.details.get('uuid')
# Find config files # Find config files
for c_path, c_ext in BOOT_FILES.items(): for c_path, c_ext in BOOT_FILES.items():
@ -399,12 +402,12 @@ def update_boot_entries():
if item.name.lower().endswith(c_ext.lower()): if item.name.lower().endswith(c_ext.lower()):
configs.append(item.path) configs.append(item.path)
# Update Linux labels # Use UUID instead of label
cmd = [ cmd = [
'sed', 'sed',
'--in-place', '--in-place',
'--regexp-extended', '--regexp-extended',
f's/{ISO_LABEL}/{UFD_LABEL}/', f's#archisolabel={ISO_LABEL}#archisodevice=/dev/disk/by-uuid/{uuid}#',
*configs, *configs,
] ]
run_program(cmd) run_program(cmd)