Commit bfccc2ab authored by Nikos Skalkotos's avatar Nikos Skalkotos

Merge branch 'hotfix-0.6.2'

parents 135fd46c 28e96790
MAIN DEVELOPERS:
Nikos Skalkotos <skalkoto@grnet.gr>
CONTRIBUTORS:
Alex Pyrgiotis <apyrgio@cslab.ece.ntua.gr>
Vangelis Koukis <vkoukis@grnet.gr>
Giannis Spiliopoulos <gspilio@admin.grnet.gr>
Konstantinos Tompoulidis <kostikas@grnet.gr>
Nikos Skalkotos
Alex Pyrgiotis
Vangelis Koukis
Giannis Spiliopoulos
Konstantinos Tompoulidis
Dionysis Grigoropoulos
2014-06-10, v0.6.2
* Add support for Ubuntu 14.04
* Fix a bug in Windows image creation
* Add .kamaki.log in the user's personal data to be removed
* Fix minor issues in the documentation
2014-01-10, v0.6.1
* Comply with the AstakosClient changes made in kamaki 0.12
......
......@@ -14,6 +14,10 @@
import sys
import os
import imp
VERSION = getattr(imp.load_source(
'image_creator.version', '../image_creator/version.py'), '__version__')
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
......@@ -43,16 +47,16 @@ master_doc = 'index'
# General information about the project.
project = u'snf-image-creator'
copyright = u'2012, 2013 GRNET S.A. All rights reserved'
copyright = u'2012-2014 GRNET S.A. All rights reserved'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '0.6.1'
version = VERSION
# The full version, including alpha/beta/rc tags.
release = '0.6.1'
release = VERSION
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -314,8 +314,8 @@ them or perform system preparation operations.
Logical Volumes
---------------
The program cannot work on LVM partitions [#f1]_. The input media may only
contain primary or logical partitions.
The program cannot work on input media that contain LVM partitions inside
[#f1]_. The input media may only contain primary or logical partitions.
Para-virtualized drivers
------------------------
......
......@@ -46,7 +46,8 @@ class Unix(OSBase):
'.gnupg',
'.ssh',
'.kamakirc',
'.kamaki.history'
'.kamaki.history',
'.kamaki.log'
]
def _mountpoints(self):
......
......@@ -209,7 +209,8 @@ class Windows(OSBase):
"""Clear all the event logs"""
self._guest_exec(
r"cmd /q /c for /f %l in ('wevtutil el') do wevtutil cl %l")
"cmd /q /c for /f \"tokens=*\" %l in ('wevtutil el') do "
"wevtutil cl \"%l\"")
@sysprep('Executing Sysprep on the image (may take more that 10 min)')
def microsoft_sysprep(self):
......
__version__ = "0.6.1"
__version__ = "0.6.2"
__version_vcs_info__ = {
'branch': 'master',
'revid': '280a0e5',
'revno': 430}
'branch': 'hotfix-0.6.2',
'revid': '73cec8b',
'revno': 438}
__version_user_email__ = "skalkoto@grnet.gr"
__version_user_name__ = "Nikos Skalkotos"
......@@ -38,7 +38,7 @@
import subprocess
import time
import signal
import distutils
from sh import which
from image_creator.util import FatalError
......@@ -53,7 +53,7 @@ class WinEXE:
@staticmethod
def is_installed(program='winexe'):
return distutils.spawn.find_executable(program) is not None
return which(program) is not None
def __init__(self, username, password, hostname, program='winexe'):
self._host = hostname
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment