Commit Graph

3059 Commits

Author SHA1 Message Date
Marek Marczykowski-Górecki
319158d5b1 backup: restore: Ignore qubes.xml in the second restore pass
Already processed in backup prepare phase). This is only because
qfile-dom0-unpacker doesn't support selective unpack (like tar do).
This should be extended to skip also VMs not selected for restore.
2013-11-09 18:54:52 +01:00
Marek Marczykowski-Górecki
1880f61c2d backup: restore: process files until EOF received
Not only until unpacker process is running. This is another race
condition, which would cause some data left in the pipe buffer not
processed.
2013-11-09 18:53:57 +01:00
Marek Marczykowski-Górecki
3c993c619c backup: restore: handle VM data with qfile format instead of simple tar
This was already partially implemented, but only for backup header
(qubes.xml).
Fix handling of vmproc object (available only when backup in another
VM).
Also fix some race conditions - wait for process termination, not only
check its exit code (which would be None if process still running).
2013-11-09 17:20:18 +01:00
Marek Marczykowski-Górecki
c61a4570e8 backup: use 'dom0' as source domain for RPC calls 2013-11-09 17:12:41 +01:00
Marek Marczykowski-Górecki
661a1ba4af backup: comment update 2013-11-09 17:12:14 +01:00
Marek Marczykowski-Górecki
54f08e00b9 backup: fix race condition with inner tar process
Do not assume that tar will finish quickly - explicitly wait for either
process termination or request for the next archive part.
2013-11-09 17:09:44 +01:00
Marek Marczykowski-Górecki
89b6069bda backup: whitespace fixes 2013-11-09 17:06:29 +01:00
Marek Marczykowski-Górecki
b84ba998a3 backup: fix misused variables - most likely copy&paste error 2013-11-09 16:56:59 +01:00
Marek Marczykowski-Górecki
5cebff34bd backup: include qubes.xml
It was commented out by mistake.
2013-11-09 16:51:25 +01:00
Marek Marczykowski-Górecki
34b03fe2b3 backup: fix setting backup qubes.xml attributes
Cannot compare QubesVm objects, because we have different instances of
QubesVmCollection. So compare QID instead.
2013-11-09 16:46:06 +01:00
Marek Marczykowski-Górecki
a56ceb92c5 backup: update for new API - use system_path hash
Instead of a bunch of global variables
2013-11-09 15:55:17 +01:00
Marek Marczykowski-Górecki
a9a8335403 Merge remote-tracking branch 'oliv/master' into new-backups
Conflicts:
	core/qubesutils.py
	dom0/qvm-core/qubes.py
2013-11-07 22:41:16 +01:00
Joanna Rutkowska
f9b37a2a38 version 2.1.25 2013-11-02 12:55:09 -04:00
Joanna Rutkowska
b33020e385 Merge branch 'master' of git://git.qubes-os.org/marmarek/core-admin 2013-11-02 11:42:41 -04:00
Joanna Rutkowska
124a8f6892 Merge branch 'master' of git://git.qubes-os.org/marmarek/core-admin 2013-11-02 11:35:41 -04:00
Marek Marczykowski-Górecki
8200b15c61 NotifyTools: handle default user setting
If the VM provides 'default-user' setting - save it to the VM settings.
2013-11-01 02:32:32 +01:00
Marek Marczykowski-Górecki
5291227de3 qvm-tools: qvm-start --install-windows-tools (#41 pro) 2013-11-01 02:31:13 +01:00
Marek Marczykowski-Górecki
c52059a23e core: unify handling dom0 case in --cdrom option 2013-11-01 02:25:22 +01:00
Marek Marczykowski-Górecki
55b4c6b6d1 missing import once again 2013-11-01 02:25:04 +01:00
Marek Marczykowski-Górecki
e2c43d2292 Allow HVM to notify dom0 about tools installation
HVM can set some xenstore entries (in qubes-tools/ subtree) to pass
informations about installed tools to dom0. qubes.NotifyTools service
triggers update of VM properties (like qrexec_installed).
This way, after installation of Qubes Windows Tools, the user doesn't need
to change any VM settings to use the tools.
2013-10-28 05:09:54 +01:00
Marek Marczykowski-Górecki
495a24a2e7 core/HVM: always start qrexec daemon
If not marked as installed, start it in background - waiting for
possible Qubes Tools installation. If that happens, make it possible to
tell the dom0 about that fact.
2013-10-28 05:08:28 +01:00
Marek Marczykowski-Górecki
3df9719972 core: add missing import 2013-10-27 16:09:16 +01:00
Marek Marczykowski-Górecki
68d8eb308c Merge branch 'master' of git://git.qubes-os.org/joanna/core-admin 2013-10-27 12:30:47 +01:00
Marek Marczykowski-Górecki
dfe0b18382 core: call ACPI S3 emulation only for VMs with PCI devices
Actually it looks to be needed only there.
But also another problem: this suspend doesn't work for firewallvm, for
unknown reason.
2013-10-24 04:10:07 +02:00
Marek Marczykowski-Górecki
149971ae2e core: add methods to trigger ACPI S3 of VM
Those methods should be called during dom0 suspend/resume.
2013-10-23 21:56:50 +02:00
Marek Marczykowski-Górecki
084b5575a9 qvm-tools: add option to list only selected VMs 2013-10-23 20:52:32 +02:00
Marek Marczykowski-Górecki
71960d83cc qmemman: fix maxmem handling (#736)
'static-max' as read from xenstore is string, so needs to be converted
to int. Additionally units needs to be adjusted (MB vs kB).
2013-10-22 02:04:39 +02:00
Olivier MEDOC
1a7d170256 backup: use tar2qfile in qubes.Restore RPC file 2013-10-21 16:04:15 +02:00
Olivier MEDOC
b96ec61e17 backup: implemented header restoration using tar2qfile 2013-10-21 15:50:54 +02:00
Olivier MEDOC
6c7322d324 backup: fixed reinitialisation of all backup flags in qubes.xml 2013-10-21 15:39:16 +02:00
Joanna Rutkowska
17e2e7d436 version 2.1.24 2013-10-19 17:29:15 +02:00
Marek Marczykowski-Górecki
aadd47ce45 dispvm: fix commit "pass VM name to qrexec-daemon" 2013-10-19 15:55:31 +02:00
Marek Marczykowski-Górecki
3443f94aa9 dispvm: fix out of memory message - Xfce version 2013-10-19 15:54:55 +02:00
Joanna Rutkowska
ef6f3d74e6 version 2.1.23 2013-10-19 11:37:09 +02:00
Marek Marczykowski-Górecki
ed3d602140 dispvm: pass VM name to qrexec-daemon
Now qrexec-daemon requires three arguments: domid, domname,
default_user.
2013-10-19 00:07:25 +02:00
Joanna Rutkowska
fb745c2ff2 version 2.1.22 2013-10-18 11:06:42 +02:00
Marek Marczykowski
5e0d8c1155 Pass domain name to qrexec daemon 2013-10-18 03:39:02 +02:00
Joanna Rutkowska
b2a0b69742 version 2.1.21 2013-10-11 12:06:05 +02:00
Marek Marczykowski-Górecki
41ba079eb8 Force the first character of VM name to be a letter
Especially don't allow numeric-only name (our deserializer of qubes.xml
will convert it to int instead of str...).
2013-10-08 22:47:56 +02:00
Marek Marczykowski-Górecki
8f302bf2bc version 2.1.20 2013-10-08 10:44:52 +02:00
Marek Marczykowski-Górecki
e6012a8fd2 Fix qubes.xml unlock code (#748)
Do not call explicit lockf(lOCK_UN) to not unlock the file
buffers are flushed. This is simpler than adding flush() call.
2013-10-02 04:54:10 +02:00
Olivier MEDOC
3e4637415a backup: improved error handling during restore process 2013-10-01 12:09:13 +02:00
Marek Marczykowski-Górecki
76144df2e7 qvm-backup: respect "include in backups by default" setting (#746) 2013-10-01 03:31:12 +02:00
Marek Marczykowski-Górecki
f74caf876b qvm-backup: support explicit list of VMs to backup 2013-10-01 03:18:44 +02:00
Olivier MEDOC
04d38055a6 backup: fixed vm extraction path and untracked errors 2013-09-30 14:54:14 +02:00
Olivier MEDOC
1a80893ef0 backup: fixed decryption during backup restoration process 2013-09-30 10:26:04 +02:00
Olivier MEDOC
c2645bcb92 backup: fix a misplaced passphrase request breaking the backup GUI 2013-09-28 12:24:33 +02:00
Olivier MEDOC
a594af02de backup: fix of a bug introduced in the qvm-backup-restore command by adding a progress_callback 2013-09-27 09:47:33 +02:00
Olivier MEDOC
26fb5b3d25 backup: fixes to use the backup GUI 2013-09-27 09:41:40 +02:00
Olivier MEDOC
af230b33a9 backup: implemented validated file extraction for non encrypted backups 2013-09-26 10:30:57 +02:00