qubes.vm.__init__ Remove uses_custom_config bits

This commit is contained in:
Bahtiar `kalkin-` Gadimov 2016-06-16 14:18:40 +02:00
parent b5fe49f422
commit f318871279

View File

@ -269,9 +269,6 @@ class BaseVM(qubes.PropertyHolder):
def create_config_file(self, file_path=None, prepare_dvm=False): def create_config_file(self, file_path=None, prepare_dvm=False):
'''Create libvirt's XML domain config file '''Create libvirt's XML domain config file
If :py:attr:`qubes.vm.qubesvm.QubesVM.uses_custom_config` is true, this
does nothing.
:param str file_path: Path to file to create \ :param str file_path: Path to file to create \
(default: :py:attr:`qubes.vm.qubesvm.QubesVM.conf_file`) (default: :py:attr:`qubes.vm.qubesvm.QubesVM.conf_file`)
:param bool prepare_dvm: If we are in the process of preparing \ :param bool prepare_dvm: If we are in the process of preparing \
@ -280,12 +277,6 @@ class BaseVM(qubes.PropertyHolder):
if file_path is None: if file_path is None:
file_path = self.conf_file file_path = self.conf_file
# TODO
# if self.uses_custom_config:
# conf_appvm = open(file_path, "r")
# domain_config = conf_appvm.read()
# conf_appvm.close()
# return domain_config
domain_config = self.app.env.get_template('libvirt/xen.xml').render( domain_config = self.app.env.get_template('libvirt/xen.xml').render(
vm=self, prepare_dvm=prepare_dvm) vm=self, prepare_dvm=prepare_dvm)