diff options
| author | OpenGnSys Support Team <soporte-og@soleta.eu> | 2024-01-11 12:24:28 +0100 |
|---|---|---|
| committer | OpenGnSys Support Team <soporte-og@soleta.eu> | 2024-01-11 12:55:37 +0100 |
| commit | 5056b8f0d5ab419ddc0a4b0dbb8f2390b1200cf9 (patch) | |
| tree | 9da7504780622a5db97e40ca0a1ecf5799befae4 /src | |
| parent | 9beb55894db6bb12725d27d608edbe9a75644b8c (diff) | |
fs: validate ntfsresize dry-run outputv1.3.2-5
validate 'Needed relocations: ' is in place before stepping on the split chunks
(2024-01-11 10:28:16) ogClient: [ERROR] - Exception when running "image create" subprocess
Traceback (most recent call last):
File "/opt/opengnsys/ogClient/src/live/ogOperations.py", line 454, in image_create
ogReduceFs(disk, partition)
File "/opt/opengnsys/ogClient/src/utils/fs.py", line 105, in ogReduceFs
_reduce_ntfsresize(partdev)
File "/opt/opengnsys/ogClient/src/utils/fs.py", line 235, in _reduce_ntfsresize
extra_size = int(out_resize_dryrun.split('Needed relocations : ')[1].split(' ')[0])*1.1+1024
IndexError: list index out of range
if not present, no need to adjust size
Diffstat (limited to 'src')
| -rw-r--r-- | src/utils/fs.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/utils/fs.py b/src/utils/fs.py index 57e6674..c030e68 100644 --- a/src/utils/fs.py +++ b/src/utils/fs.py @@ -232,8 +232,9 @@ def _reduce_ntfsresize(partdev): if 'Nothing to do: NTFS volume size is already OK.' in out_resize_dryrun: logging.warn('ntfsresize reports nothing to do. Is the target filesystem already shrunken?') break - extra_size = int(out_resize_dryrun.split('Needed relocations : ')[1].split(' ')[0])*1.1+1024 - new_size += int(extra_size) + if out_resize_dryrun.find('Needed relocations : ') != -1: + extra_size = int(out_resize_dryrun.split('Needed relocations : ')[1].split(' ')[0])*1.1+1024 + new_size += int(extra_size) if new_size < size: cmd_resize = shlex.split(f'ntfsresize -fs {new_size:.0f} {partdev}') |