Fixed prep_device()
This commit is contained in:
parent
2230ea1eea
commit
c8944e5a14
2 changed files with 18 additions and 6 deletions
|
|
@ -52,14 +52,14 @@ if __name__ == '__main__':
|
||||||
show_selections(args, sources, ufd_dev, UFD_SOURCES)
|
show_selections(args, sources, ufd_dev, UFD_SOURCES)
|
||||||
confirm_selections(args)
|
confirm_selections(args)
|
||||||
|
|
||||||
# TODO: DELETEME
|
|
||||||
print_success("It's go-time!")
|
|
||||||
exit_script()
|
|
||||||
|
|
||||||
# Format and partition device
|
# Format and partition device
|
||||||
if not args['--update']:
|
if not args['--update']:
|
||||||
prep_device(ufd_dev, UFD_LABEL, use_mbr=args['--use-mbr'])
|
prep_device(ufd_dev, UFD_LABEL, use_mbr=args['--use-mbr'])
|
||||||
|
|
||||||
|
# TODO: DELETEME
|
||||||
|
print_success("It's go-time!")
|
||||||
|
exit_script()
|
||||||
|
|
||||||
# Copy sources
|
# Copy sources
|
||||||
|
|
||||||
# Update boot entries
|
# Update boot entries
|
||||||
|
|
|
||||||
|
|
@ -143,7 +143,7 @@ def prep_device(dev_path, label, use_mbr=False):
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create partition table
|
# Create partition table
|
||||||
cmd = 'parted {} --script -- mklabel {} primary fat32 4MiB {}'.format(
|
cmd = 'parted {} --script -- mklabel {} mkpart primary fat32 4MiB {}'.format(
|
||||||
dev_path,
|
dev_path,
|
||||||
'msdos' if use_mbr else 'gpt',
|
'msdos' if use_mbr else 'gpt',
|
||||||
'-1s' if use_mbr else '-4MiB',
|
'-1s' if use_mbr else '-4MiB',
|
||||||
|
|
@ -165,11 +165,23 @@ def prep_device(dev_path, label, use_mbr=False):
|
||||||
cmd=cmd,
|
cmd=cmd,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Find partition
|
||||||
|
cmd = [
|
||||||
|
'lsblk',
|
||||||
|
'--list',
|
||||||
|
'--noheadings',
|
||||||
|
'--output', 'name',
|
||||||
|
'--paths',
|
||||||
|
dev_path,
|
||||||
|
]
|
||||||
|
result = run_program(cmd, encoding='utf-8', errors='ignore')
|
||||||
|
part_path = result.stdout.splitlines()[-1].strip()
|
||||||
|
|
||||||
# Format partition
|
# Format partition
|
||||||
cmd = [
|
cmd = [
|
||||||
'mkfs.vfat', '-F', '32',
|
'mkfs.vfat', '-F', '32',
|
||||||
'-n', label,
|
'-n', label,
|
||||||
'{}1'.format(dev_path),
|
part_path,
|
||||||
]
|
]
|
||||||
try_and_print(
|
try_and_print(
|
||||||
message='Formatting partition...',
|
message='Formatting partition...',
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue