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

do not print scary message when qvm-create --force-root is used

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2015-07-30 23:08:45 +02:00
parent 90393c33f2
commit 52d7de006b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qvm-tools/qvm-create
View File

@ -74,14 +74,11 @@ def main():
if (options.netvm + options.proxyvm + options.hvm + options.hvm_template) > 1:
parser.error ("You must specify at most one VM type switch")
if hasattr(os, "geteuid") and os.geteuid() == 0:
if not options.force_root and hasattr(os, "geteuid") and os.geteuid() == 0:
print >> sys.stderr, "*** Running this tool as root is strongly discouraged, this will lead you in permissions problems."
if options.force_root:
print >> sys.stderr, "Continuing as commanded. You have been warned."
else:
print >> sys.stderr, "Retry as unprivileged user."
print >> sys.stderr, "... or use --force-root to continue anyway."
exit(1)
print >> sys.stderr, "Retry as unprivileged user."
print >> sys.stderr, "... or use --force-root to continue anyway."
exit(1)
if options.label is None:
print >> sys.stderr, "You must choose a label for the new VM by passing the --label option."