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

Bugfix: find_windows_image()

Browse source
This commit is contained in:
Alan Mason 2017-12-01 12:41:39 -08:00
parent 5d32f3c94a
commit a6f9518648
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Scripts/functions/windows_setup.py
View file

@ -56,17 +56,20 @@ def find_windows_image(windows_version):
# Check for network source # Check for network source
if not image: if not image:
mount_windows_share() mount_windows_share()
if not WINDOWS_SERVER['Mounted']: if WINDOWS_SERVER['Mounted']:
return None for ext in ['esd', 'wim', 'swm']:
for ext in ['esd', 'wim', 'swm']: path = r'\\{}\{}\images\{}.ext'.format(
path = r'\\{}\{}\images\{}.ext'.format( WINDOWS_SERVER['IP'],
WINDOWS_SERVER['IP'], WINDOWS_SERVER['Share'], imagefile, ext) WINDOWS_SERVER['Share'],
if os.path.isfile(path) and wim_contains_image(path, imagename): imagefile,
image['Path'] = path ext)
image['Source'] = None if os.path.isfile(path) and wim_contains_image(path, imagename):
if ext == 'swm': image['Path'] = path
image['Glob'] = '--ref="{}*.swm"'.format(image['Path'][:-4]) image['Source'] = None
break if ext == 'swm':
image['Glob'] = '--ref="{}*.swm"'.format(
image['Path'][:-4])
break
# Display image to be used (if any) and return # Display image to be used (if any) and return
if image: if image: