StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1164 from maces/patch-1 

fixing swap path + support partition size units
This commit is contained in:
Dan Bungert 2022-03-15 15:38:31 -06:00 committed by GitHub
parent 54d75feaa5 7c7b6da7f6
commit bed7cffe3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/validate-yaml.py
View File

@ -14,7 +14,10 @@ class StorageChecker:
def _check_partition(self, action):
assert 'device' in action
assert 'size' in action
assert action['size'] % 512 == 0
size = str(action['size'])
size_units = ['B', 'KB', 'K', 'MB', 'M', 'GB', 'G', 'TB', 'T', '%']
valid_unit = any(unit in size for unit in size_units)
assert size == '-1' or valid_unit or int(size) % 512 == 0
assert 'number' in action
assert action['device'] in self.actions
assert 'ptable' in self.actions[action['device']]
@ -30,7 +33,7 @@ class StorageChecker:
def _check_mount(self, action):
assert 'device' in action
assert action['device'] in self.actions
if not action.get('path'):
if not action.get('path') or action.get('path') == 'none':
assert self.actions[action['device']]['fstype'] == "swap"
self.unmounted_swap_ids.remove(action['device'])
else: