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

Warning the user if calling qvm-{create,remove} as root (#200)

Browse Source
This commit is contained in:
Marek Marczykowski 2011-04-06 23:52:39 +02:00
parent d1abb37a5f
commit c569d4070e
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom0/qvm-tools/qvm-create
View File

@ -65,6 +65,8 @@ def main():
help="VCPUs count") help="VCPUs count")
parser.add_option ("-i", "--internal", action="store_true", dest="internal", default=False, parser.add_option ("-i", "--internal", action="store_true", dest="internal", default=False,
help="Create VM for internal use only (hidden in qubes-manager, no appmenus)") help="Create VM for internal use only (hidden in qubes-manager, no appmenus)")
parser.add_option ("--force-root", action="store_true", dest="force_root", default=False,
help="Force to run, even with root privileges")
parser.add_option ("-q", "--quiet", action="store_false", dest="verbose", default=True) parser.add_option ("-q", "--quiet", action="store_false", dest="verbose", default=True)
(options, args) = parser.parse_args () (options, args) = parser.parse_args ()
@ -75,6 +77,15 @@ def main():
if options.netvm and options.proxyvm: if options.netvm and options.proxyvm:
parser.error ("You must specify at most one of --proxy and --net") parser.error ("You must specify at most one of --proxy and --net")
if os.geteuid() == 0:
print "*** Running this tool as root is strongly discouraged, this will lead you in permissions problems."
if options.force_root:
print "Continuing as commanded. You have been warned."
else:
print "Retry as unprivileged user."
print "... or use --force-root to continue anyway."
exit(1)
if options.label is None: if options.label is None:
print "You must choose a label for the new VM by passing the --label option." print "You must choose a label for the new VM by passing the --label option."
print "Possible values are:" print "Possible values are:"

11
dom0/qvm-tools/qvm-remove
View File

@ -29,6 +29,8 @@ def main():
parser.add_option ("-q", "--quiet", action="store_false", dest="verbose", default=True) parser.add_option ("-q", "--quiet", action="store_false", dest="verbose", default=True)
parser.add_option ("--just-db", action="store_true", dest="remove_from_db_only", default=False, parser.add_option ("--just-db", action="store_true", dest="remove_from_db_only", default=False,
help="Remove only from the Qubes Xen DB, do not remove any files") help="Remove only from the Qubes Xen DB, do not remove any files")
parser.add_option ("--force-root", action="store_true", dest="force_root", default=False,
help="Force to run, even with root privileges")
(options, args) = parser.parse_args () (options, args) = parser.parse_args ()
if (len (args) != 1): if (len (args) != 1):
parser.error ("You must specify VM name!") parser.error ("You must specify VM name!")
@ -42,6 +44,15 @@ def main():
print "A VM with the name '{0}' does not exist in the system.".format(vmname) print "A VM with the name '{0}' does not exist in the system.".format(vmname)
exit(1) exit(1)
if os.geteuid() == 0:
print "*** Running this tool as root is strongly discouraged, this will lead you in permissions problems."
if options.force_root:
print "Continuing as commanded. You have been warned."
else:
print "Retry as unprivileged user."
print "... or use --force-root to continue anyway."
exit(1)
if vm.is_template(): if vm.is_template():
dependent_vms = qvm_collection.get_vms_based_on(vm.qid) dependent_vms = qvm_collection.get_vms_based_on(vm.qid)
if len(dependent_vms) > 0: if len(dependent_vms) > 0: