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

qvm-template-commit: add --offline-mode option

Browse Source 
Allow force offline mode (disable check if VM isn't running) - useful
for running from anaconda (inside of chroot).
This commit is contained in:
Marek Marczykowski 2013-05-18 05:59:39 +02:00 committed by Marek Marczykowski-Górecki
parent 8e9c59e7f8
commit 5a28074c2b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core-modules/003QubesTemplateVm.py
View File

@ -28,7 +28,7 @@ import sys
from qubes.qubes import QubesVm,register_qubes_vm_class,dry_run from qubes.qubes import QubesVm,register_qubes_vm_class,dry_run
from qubes.qubes import QubesVmCollection,QubesException,QubesVmLabels from qubes.qubes import QubesVmCollection,QubesException,QubesVmLabels
from qubes.qubes import defaults,system_path,vm_files from qubes.qubes import defaults,system_path,vm_files,vmm
class QubesTemplateVm(QubesVm): class QubesTemplateVm(QubesVm):
""" """
@ -151,6 +151,7 @@ class QubesTemplateVm(QubesVm):
def commit_changes (self, verbose = False): def commit_changes (self, verbose = False):
if not vmm.offline_mode:
assert not self.is_running(), "Attempt to commit changes on running Template VM!" assert not self.is_running(), "Attempt to commit changes on running Template VM!"
if verbose: if verbose:

7
qvm-tools/qvm-template-commit
View File

@ -21,7 +21,7 @@
# #
# #
from qubes.qubes import QubesVmCollection from qubes.qubes import QubesVmCollection,vmm
from qubes.qubes import QubesException from qubes.qubes import QubesException
from optparse import OptionParser from optparse import OptionParser
import subprocess import subprocess
@ -39,6 +39,9 @@ def main():
parser.error ("You must specify VM name!") parser.error ("You must specify VM name!")
vmname = args[0] vmname = args[0]
if options.offline_mode:
vmm.offline_mode = True
qvm_collection = QubesVmCollection() qvm_collection = QubesVmCollection()
qvm_collection.lock_db_for_reading() qvm_collection.lock_db_for_reading()
qvm_collection.load() qvm_collection.load()
@ -53,7 +56,7 @@ def main():
print >> sys.stderr, "A VM '{0}' is not template.".format(vmname) print >> sys.stderr, "A VM '{0}' is not template.".format(vmname)
exit(1) exit(1)
if vm.is_running(): if not vmm.offline_mode and vm.is_running():
print >> sys.stderr, "You must stop VM first." print >> sys.stderr, "You must stop VM first."
exit(1) exit(1)