Merge remote-tracking branch 'qubesos/pr/44'

* qubesos/pr/44:
  Correct note regarding dom0 home-pre-restore directory
This commit is contained in:
Marek Marczykowski-Górecki 2016-07-17 03:56:39 +02:00
commit b5bee9470a
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -287,9 +287,10 @@ def main():
print >> sys.stderr, "NOTE: Before restoring the dom0 home directory, " print >> sys.stderr, "NOTE: Before restoring the dom0 home directory, "
"a new directory named "\ "a new directory named "\
"'home-pre-restore-<current-time>' will be "\ "'home-pre-restore-<current-time>' will be "\
"created inside the dom0 home directory, and "\ "created inside the dom0 home directory. If any "\
"all the other existing contents of the dom0 "\ "restored files conflict with existing files, "\
"home directory will be moved there." "the existing files will be moved to this new "\
"directory."
if options.pass_file is None: if options.pass_file is None:
if raw_input("Do you want to proceed? [y/N] ").upper() != "Y": if raw_input("Do you want to proceed? [y/N] ").upper() != "Y":