Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dom0: create config template for DispVM

Browse Source 
Introduction for later patches.
This commit is contained in:
Marek Marczykowski 2011-06-08 03:30:42 +02:00
parent 1647d03f74
commit fcd4cd44eb
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom0/qvm-core/qubes.py
View File

@ -648,7 +648,7 @@ class QubesVm(object):
return args return args
def create_config_file(self, file_path = None, source_template = None): def create_config_file(self, file_path = None, source_template = None, prepare_dvm = False):
if file_path is None: if file_path is None:
file_path = self.conf_file file_path = self.conf_file
if source_template is None: if source_template is None:
@ -659,6 +659,10 @@ class QubesVm(object):
f_conf_template.close() f_conf_template.close()
template_params = self.get_config_params(source_template) template_params = self.get_config_params(source_template)
if prepare_dvm:
template_params['name'] = '%NAME%'
template_params['privatedev'] = ''
template_params['netdev'] = re.sub(r"ip=[0-9.]*", "ip=%IP%", template_params['netdev'])
conf_appvm = open(file_path, "w") conf_appvm = open(file_path, "w")
conf_appvm.write(conf_template.format(**template_params)) conf_appvm.write(conf_template.format(**template_params))
@ -934,6 +938,11 @@ class QubesVm(object):
self.force_shutdown() self.force_shutdown()
raise OSError ("ERROR: Cannot execute qrexec_daemon!") raise OSError ("ERROR: Cannot execute qrexec_daemon!")
if preparing_dvm:
if verbose:
print "--> Preparing config template for DispVM"
self.create_config_file(file_path = self.dir_path + '/dvm.conf', prepare_dvm = True)
# perhaps we should move it before unpause and fork? # perhaps we should move it before unpause and fork?
# FIXME: this uses obsolete xm api # FIXME: this uses obsolete xm api
if debug_console: if debug_console: