Commit Graph

2747 Commits

Author SHA1 Message Date
Joanna Rutkowska
f6fc01fe02 Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-06-28 12:34:24 +02:00
Marek Marczykowski
2854f08bca dom0/core: fix the last merge...
Remove duplicated lines by faulty conflict resolution.
2012-06-28 12:28:14 +02:00
Joanna Rutkowska
9a696b1e28 Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-06-28 12:19:32 +02:00
Joanna Rutkowska
75a6360eec version 1.7.31 2012-06-28 12:19:10 +02:00
Marek Marczykowski
41efe076b2 dom0/core: typo fix in clone_disk_files (#608) 2012-06-28 11:37:18 +02:00
Marek Marczykowski
50dc086682 dom0/core: typo fix in clone_disk_files (#608) 2012-06-26 11:05:03 +02:00
Marek Marczykowski
44767bea7f Merge branch 'master' into hvm
Conflicts:
	dom0/init.d/qubes_core
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-prefs
	version_dom0
	version_vm
2012-06-26 03:49:10 +02:00
Marek Marczykowski
2afbc2b6c7 Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core 2012-06-26 03:44:31 +02:00
Marek Marczykowski
0006ebdaff vm/spec: fix enabling NetworkManager SystemD service 2012-06-26 03:43:36 +02:00
Marek Marczykowski
a6c7d0efbe vm/spec: fix error messages 2012-06-26 03:43:36 +02:00
Marek Marczykowski
da63af599c vm/spec: fix enabling of qubes-firewall SysV service 2012-06-26 03:43:36 +02:00
Marek Marczykowski
bf9b63e06f dom0/qmemman: allow balance when xen have low free memory (#563) 2012-06-26 03:43:36 +02:00
Marek Marczykowski
2e7d5cc178 dom0: appmenu to start Firefox in new DispVM (#594) 2012-06-26 03:43:36 +02:00
Marek Marczykowski
4f7656e36f vm/spec: fix enabling NetworkManager SystemD service 2012-06-26 03:36:22 +02:00
Marek Marczykowski
4cc7d9300f vm/spec: fix error messages 2012-06-26 03:31:28 +02:00
Marek Marczykowski
71c4ca8804 vm/spec: fix enabling of qubes-firewall SysV service 2012-06-26 03:30:06 +02:00
Marek Marczykowski
29e3593a02 dom0/qmemman: allow balance when xen have low free memory (#563) 2012-06-26 00:26:53 +02:00
Joanna Rutkowska
16b4eae2fc version 2.0.30-dom0 2012-06-25 23:55:09 +02:00
Joanna Rutkowska
87b07872ae version 1.7.30 2012-06-25 23:38:18 +02:00
Marek Marczykowski
0008e71784 dom0: appmenu to start Firefox in new DispVM (#594) 2012-06-24 14:09:43 +02:00
Marek Marczykowski
3d7c774d0c Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core 2012-06-23 20:18:21 +02:00
Marek Marczykowski
55ad480a14 Merge branch 'hvm' of ssh://gitpro.qubes-os.org/var/lib/qubes/git/joanna/core into hvm 2012-06-23 20:14:20 +02:00
Marek Marczykowski
ad7d6957b1 dom0/updates: clean yum cache as root (#540)
Actually looks like this solve problem, don't know why (cleaning as user
didn't returned any error).
2012-06-23 00:37:47 +02:00
Marek Marczykowski
89aaa60753 dom0: use RPC service to sync clock via NTP (#603) 2012-06-23 00:37:47 +02:00
Marek Marczykowski
f53ebfc3cd vm: RPC service for NTP time sync (#603) 2012-06-23 00:37:47 +02:00
Marek Marczykowski
2ddd53e1e4 vm: support for magic QUBESRPC command
Previously dom0 had to know full path of qubes_rpc_multiplexer in VM, which can
differ between VMs (eg totally different on Windows). This commit enables dom0
to magic keyword instead of full path.
2012-06-23 00:37:47 +02:00
Marek Marczykowski
24352c3dce dom0: minor init.d script fix 2012-06-23 00:37:47 +02:00
Marek Marczykowski
be7c079705 dom0/updates: clean yum cache as root (#540)
Actually looks like this solve problem, don't know why (cleaning as user
didn't returned any error).
2012-06-22 23:44:05 +02:00
Marek Marczykowski
1dad96b0e9 dom0: use RPC service to sync clock via NTP (#603) 2012-06-22 22:23:17 +02:00
Marek Marczykowski
8e61660687 vm: RPC service for NTP time sync (#603) 2012-06-22 22:22:57 +02:00
Marek Marczykowski
28ca836e14 vm: support for magic QUBESRPC command
Previously dom0 had to know full path of qubes_rpc_multiplexer in VM, which can
differ between VMs (eg totally different on Windows). This commit enables dom0
to magic keyword instead of full path.
2012-06-22 22:16:08 +02:00
Joanna Rutkowska
ceb3feccd8 version 2.0.29 2012-06-22 15:29:03 +02:00
Joanna Rutkowska
5805146b6e Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-06-22 15:21:14 +02:00
Joanna Rutkowska
c34f10a6f6 version 1.7.29-dom0 2012-06-22 15:20:21 +02:00
Joanna Rutkowska
b3ef32d36e Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-06-22 15:17:45 +02:00
Marek Marczykowski
36f6a2c42c dom0: minor init.d script fix 2012-06-22 01:22:06 +02:00
Marek Marczykowski
ffa3d8732c dom0: use new qubes-manager appmenu applet (#548) 2012-06-22 01:15:54 +02:00
Marek Marczykowski
96f7d4da81 Revert "dom0/appmenus: do not add "Add more shortcuts" menu (#458)" (#548)
This reverts commit 8b613a10b4.

Restore this option.
2012-06-22 01:15:54 +02:00
Marek Marczykowski
51f4a60a44 dom0: use new qubes-manager appmenu applet (#548) 2012-06-21 11:57:36 +02:00
Marek Marczykowski
3109deebd5 Revert "dom0/appmenus: do not add "Add more shortcuts" menu (#458)" (#548)
This reverts commit 8b613a10b4.

Restore this option.
2012-06-21 11:50:52 +02:00
Joanna Rutkowska
154eef703f version 2.0.28 2012-06-19 15:31:43 +02:00
Marek Marczykowski
6b8f090223 dom0/qvm-firewall: eliminate duplicate firewall defaults definition (#599)
This caused ignore of different firewall defaults for TemplateVM.
2012-06-19 15:29:36 +02:00
Joanna Rutkowska
da70b2ac03 Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-06-19 15:23:39 +02:00
Joanna Rutkowska
e31228656d 1.7.28-dom0 2012-06-19 15:22:23 +02:00
Joanna Rutkowska
617656cd2a Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-06-19 15:20:05 +02:00
Marek Marczykowski
c978ce3a48 dom0/qvm-firewall: eliminate duplicate firewall defaults definition (#599)
This caused ignore of different firewall defaults for TemplateVM.
2012-06-19 00:59:27 +02:00
Marek Marczykowski
0e2aba228f dom0: minor qvm-sync-clock fix
Catch any error in vm.run, to not break clock syncing of all VMs because one
VM.
2012-06-19 00:59:27 +02:00
Marek Marczykowski
ab9c2e503a dom0: qvm-run --nogui switch
Can be used to not start guid.
2012-06-19 00:59:27 +02:00
Marek Marczykowski
a4e10f00c1 dom0/qvm-firewall: eliminate duplicate firewall defaults definition (#599)
This caused ignore of different firewall defaults for TemplateVM.
2012-06-18 23:51:44 +02:00
Marek Marczykowski
9b8f970ec8 Merge branch 'hvm' of git://gitpro.qubes-os.org/alex/core into hvm 2012-06-15 17:48:37 +02:00