From 3f8c626fcaf0db2cc304de9497bc86109554b124 Mon Sep 17 00:00:00 2001 From: brent s Date: Mon, 15 May 2017 02:46:24 -0400 Subject: [PATCH] changing size attrib to stop --- aif.xsd | 2 +- aifclient.py | 6 +++--- docs/README.adoc | 4 ++-- docs/examples/aif-secure.xml | 4 ++-- docs/examples/aif.xml | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aif.xsd b/aif.xsd index 3909fe0..d20925a 100644 --- a/aif.xsd +++ b/aif.xsd @@ -144,7 +144,7 @@ - + diff --git a/aifclient.py b/aifclient.py index d90070a..e8ea2bf 100755 --- a/aifclient.py +++ b/aifclient.py @@ -404,7 +404,7 @@ class archInstall(object): disksize['max'] = subprocess.check_output(['sgdisk', '-E', d]) for p in partnums: # Need to do some mathz to get the actual sectors if we're using percentages. - for s in ('start', 'size'): + for s in ('start', 'stop'): val = self.disk[d]['parts'][str(p)][s] if '%' in val: stripped = val.replace('%', '') @@ -419,7 +419,7 @@ class archInstall(object): for p in partnums: size = {} size['start'] = self.disk[d]['parts'][str(p)]['start'] - size['end'] = self.disk[d]['parts'][str(p)]['size'] + size['end'] = self.disk[d]['parts'][str(p)]['stop'] fstype = self.disk[d]['parts'][str(p)]['fstype'].lower() if fstype not in fstypes.keys(): print('Filesystem type {0} is not valid. Must be a code from:\nCODE:FILESYSTEM'.format(fstype)) @@ -429,7 +429,7 @@ class archInstall(object): cmds.append(['sgdisk', '-n', '{0}:{1}:{2}'.format(str(p), self.disk[d]['parts'][str(p)]['start'], - self.disk[d]['parts'][str(p)]['size']), + self.disk[d]['parts'][str(p)]['stop']), #'-c', '{0}:"{1}"'.format(str(p), self.disk[d]['parts'][str(p)]['label']), # TODO: add support for partition labels '-t', '{0}:{1}'.format(str(p), fstype), d]) diff --git a/docs/README.adoc b/docs/README.adoc index 870005e..15ec790 100644 --- a/docs/README.adoc +++ b/docs/README.adoc @@ -217,12 +217,12 @@ The `/aif/storage/disk/part` element holds information on partitioning that it's ^|Attribute ^|Value ^m|num |The partition number (positive integer) ^m|start |The amount of the *total disk size* to _start_ the partition at (see <>) -^m|size |The amount of the *total disk size* to _end_ the partition at (see <>) +^m|stop |The amount of the *total disk size* to _end_ the partition at (see <>) ^m|fstype |The partition type. Must be in http://www.rodsbooks.com/gdisk/cgdisk-walkthrough.html[gdisk format^] (see <>) |====================== [[specialsize]] -The `start` and `size` attributes can be in the form of: +The `start` and `stop` attributes can be in the form of: * A percentage, indicated by a percentage sign (`"10%"`) * A size, indicated by the abbreviation (`"300K"`, `"30G"`, etc.) diff --git a/docs/examples/aif-secure.xml b/docs/examples/aif-secure.xml index 81c1457..a9d3c2f 100644 --- a/docs/examples/aif-secure.xml +++ b/docs/examples/aif-secure.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://aif.square-r00t.net aif.xsd"> - - + + diff --git a/docs/examples/aif.xml b/docs/examples/aif.xml index c3a430a..c2c83f3 100644 --- a/docs/examples/aif.xml +++ b/docs/examples/aif.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="https://aif.square-r00t.net aif.xsd"> - - - + + +