x-move/iconograph
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Write image_time in /etc/iconograph.json

Browse Source
This commit is contained in:
Ian Gulliver
2016-05-09 22:46:24 +00:00
parent 6ad79c672e
commit b5e2d8d64c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/build_image.py
View File

@@ -26,6 +26,11 @@ parser.add_argument(
dest='image_dir', dest='image_dir',
action='store', action='store',
required=True) required=True)
parser.add_argument(
'--image-type',
dest='image_type',
action='store',
required=True)
parser.add_argument( parser.add_argument(
'--kernel-arg', '--kernel-arg',
dest='kernel_args', dest='kernel_args',
@@ -97,9 +102,10 @@ class ImageBuilder(object):
'loopback.cfg': 'boot/grub/loopback.cfg', 'loopback.cfg': 'boot/grub/loopback.cfg',
} }
def __init__(self, source_iso, image_dir, archive, arch, release, modules, kernel_args, volume_id=None): def __init__(self, source_iso, image_dir, image_type, archive, arch, release, modules, kernel_args, volume_id=None):
self._source_iso = source_iso self._source_iso = source_iso
self._image_dir = image_dir self._image_dir = image_dir
self._image_type = image_type
self._archive = archive self._archive = archive
self._arch = arch self._arch = arch
self._release = release self._release = release
@@ -226,11 +232,13 @@ class ImageBuilder(object):
def _WriteVersion(self, chroot_path, timestamp): def _WriteVersion(self, chroot_path, timestamp):
with open(os.path.join(chroot_path, 'etc', 'iconograph.json'), 'w') as fh: with open(os.path.join(chroot_path, 'etc', 'iconograph.json'), 'w') as fh:
info = { info = {
'image_type': self._image_type,
'timestamp': timestamp, 'timestamp': timestamp,
} }
if FLAGS.volume_id: if FLAGS.volume_id:
info['volume_id'] = FLAGS.volume_id info['volume_id'] = FLAGS.volume_id
json.dump(info, fh, sort_keys=True, indent=4) json.dump(info, fh, sort_keys=True, indent=4)
fh.write('\n')
def _RunModules(self, chroot_path): def _RunModules(self, chroot_path):
for module in self._modules: for module in self._modules:
@@ -283,7 +291,7 @@ class ImageBuilder(object):
dest_fh.write(line.replace('$KERNEL_ARGS', ' '.join(self._kernel_args))) dest_fh.write(line.replace('$KERNEL_ARGS', ' '.join(self._kernel_args)))
def _CreateISO(self, union_path, timestamp): def _CreateISO(self, union_path, timestamp):
dest_iso = os.path.join(self._image_dir, '%d.iso' % timestamp) dest_iso = os.path.join(self._image_dir, self._image_type, '%d.iso' % timestamp)
args = [ args = [
'--output=%s' % dest_iso, '--output=%s' % dest_iso,
'--', '--',
@@ -343,6 +351,7 @@ def main():
builder = ImageBuilder( builder = ImageBuilder(
FLAGS.source_iso, FLAGS.source_iso,
FLAGS.image_dir, FLAGS.image_dir,
FLAGS.image_type,
FLAGS.archive, FLAGS.archive,
FLAGS.arch, FLAGS.arch,
FLAGS.release, FLAGS.release,