Commit Graph

4438 Commits

Author SHA1 Message Date
Marek Marczykowski
3171cdbdcc Merge branch 'master' into hvm
Conflicts:
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-create
	dom0/qvm-tools/qvm-prefs
2012-03-09 11:34:13 +01:00
Marek Marczykowski
cdd73f3d14 dom0/core: drop support for non-updateable templates
Implement 'updateable' property as 'template is None'
2012-03-09 11:28:06 +01:00
Marek Marczykowski
f143b6c1f2 dom0/core: minor error handling fix 2012-03-09 11:02:38 +01:00
Marek Marczykowski
d7aed8b233 dom0/core: API CHANGE: change 'template_vm' to 'template'
Just to match property displayed everywhere, also simplifying tools like
qvm-prefs.
2012-03-09 11:01:20 +01:00
Joanna Rutkowska
5517a013cf version 2.0.8 2012-03-09 10:48:43 +01:00
Joanna Rutkowska
c0ed115577 Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm
Conflicts:
	version_dom0
2012-03-09 10:47:09 +01:00
Marek Marczykowski
a58259a171 Merge branch 'master' into hvm
Conflicts:
	version_dom0
	version_vm
2012-03-09 10:19:34 +01:00
Joanna Rutkowska
830402b875 version 1.7.17 2012-03-09 09:46:06 +01:00
Marek Marczykowski
e9d341ff71 vm/netwatcher: fix watch 2012-03-09 01:54:16 +01:00
Marek Marczykowski
ceed4507eb dom0/qvm-network: implement dynamic switching in property setter (#478)
Also add to it missing parts: firewall reload and netid attr set (+perms for it)
2012-03-09 01:52:28 +01:00
Marek Marczykowski
9547b191ad vm/qvm-firewall: force firewall reload on service start (#478)
This makes firewall reload triggered by qubes-netwatcher working again.
2012-03-09 01:50:51 +01:00
Marek Marczykowski
0b142fb040 vm/init.d: make firewall and netwatcher service consistent with systemd 2012-03-09 01:50:18 +01:00
Marek Marczykowski
0bad3c3dec vm/netwatcher: watch also for netvm change (#478) 2012-03-09 01:01:30 +01:00
Marek Marczykowski
8170a6d675 Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core 2012-03-09 01:00:08 +01:00
Joanna Rutkowska
29d7fbfad3 vm/qubes_netwatcher: correct type in service name (#465)
This prevented netwatcher being started in the firewallvm.
2012-03-09 00:21:54 +01:00
Marek Marczykowski
d91bbdb3dd dom0/qvm-block: add support for md devices (#476) 2012-03-09 00:04:36 +01:00
Joanna Rutkowska
eac46002c0 version 2.0.7 2012-03-09 00:02:05 +01:00
Joanna Rutkowska
608c142756 Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm
Conflicts:
	version_dom0
2012-03-09 00:01:06 +01:00
Marek Marczykowski
c174d0c184 dom0/qvm-block: ignore unsupported devices istead of throw exception (#476) 2012-03-09 00:00:20 +01:00
Joanna Rutkowska
35b1264424 version 1.7.16 2012-03-08 21:45:55 +01:00
Joanna Rutkowska
bd88525f3c Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-03-08 21:40:30 +01:00
Marek Marczykowski
59e9db28b9 Merge branch 'hvm' of ssh://gitpro.qubes-os.org/var/lib/qubes/git/joanna/core into hvm
Conflicts:
	version_dom0
2012-03-08 18:06:30 +01:00
Marek Marczykowski
2b94ff10d3 Merge branch 'master' into hvm
Conflicts:
	dom0/qvm-core/qubes.py
	version_dom0
	version_vm
2012-03-08 15:03:49 +01:00
Marek Marczykowski
eed0b16174 vm/network: use metric to allow multiple routes to same VM
This is required when VM has multiple interfaces (eg HVM: PV and stubdom).
Prefer the later one.
2012-03-08 15:00:24 +01:00
Marek Marczykowski
4d0839d05b vm/network: really place anti-spoof rules in 'raw' table
This fixes commit:
4d68998 vm/network: place anti-spoof rules in 'raw' table
2012-03-08 15:00:20 +01:00
Marek Marczykowski
05db5c9f92 vm/network: use metric to allow multiple routes to same VM
This is required when VM has multiple interfaces (eg HVM: PV and stubdom).
Prefer the later one.
2012-03-08 14:57:10 +01:00
Marek Marczykowski
a06c8c3786 vm/network: really place anti-spoof rules in 'raw' table
This fixes commit:
4d68998 vm/network: place anti-spoof rules in 'raw' table
2012-03-08 14:56:39 +01:00
Marek Marczykowski
1d5f54c976 dom0/qvm-firewall: make firewall IP-based, not IF-based
Some VMs (especially HVM) can have more than one vif, so to not dupplicate
rules, make it IP based.
2012-03-08 14:50:46 +01:00
Marek Marczykowski
cae2672171 dom0/qvm-firewall: make firewall IP-based, not IF-based
Some VMs (especially HVM) can have more than one vif, so to not dupplicate
rules, make it IP based.
2012-03-08 14:40:00 +01:00
Joanna Rutkowska
2af085fc0c version 1.7.15 2012-03-08 12:44:41 +01:00
Marek Marczykowski
8c794d95e2 dom0/core: pause also stubdom when pausing HVM 2012-03-08 12:19:37 +01:00
Marek Marczykowski
07f560042c dom0/core: use QubesVm.pause/unpause instead of xl directly 2012-03-08 12:04:47 +01:00
Marek Marczykowski
fc283e22c8 dom0/core: use QubesVm.pause/unpause instead of xl directly 2012-03-08 12:03:49 +01:00
Marek Marczykowski
fc573d0467 dom0/core: follow new __init__ API in QubesHVm 2012-03-08 11:57:47 +01:00
Marek Marczykowski
567229c104 dom0/core: follow new __init__ api in subclasses 2012-03-08 11:57:11 +01:00
Marek Marczykowski
63e19e1afa dom0/core: follow new __init__ api in subclasses 2012-03-08 11:56:26 +01:00
Marek Marczykowski
de9f952a2e dom0/core: more generic way to specify xen config template 2012-03-08 11:54:27 +01:00
Marek Marczykowski
8433931822 dom0/core: major rework of QubesVm.__init__ and serialization
No more manually set attributes, each in different way. Now there is one dict
with attrs, defaults, used also for object serialization to XML.
2012-03-08 11:27:56 +01:00
Marek Marczykowski
07d7620f23 dom0/core: major rework of QubesVm.__init__ and serialization
No more manually set attributes, each in different way. Now there is one dict
with attrs, defaults, used also for object serialization to XML.
2012-03-08 11:22:46 +01:00
Marek Marczykowski
9360a18b0c dom0/QubesVm: add include_in_backups property 2012-03-07 19:16:25 +01:00
Marek Marczykowski
f6c222d957 dom0/QubesVm: add include_in_backups property 2012-03-07 19:15:51 +01:00
Marek Marczykowski
7d07bc718b dom0/dispvm: clone QubesVmLabel object for DispVM 2012-03-07 19:04:47 +01:00
Marek Marczykowski
b3d0afc360 dom0/dispvm: clone QubesVmLabel object for DispVM 2012-03-07 18:50:56 +01:00
Marek Marczykowski
e2c62b9424 dom0/dispvm: icons for DispVM
Beautiful icons thanks to Agnieszka Kostrzewa!
2012-03-07 17:13:03 +01:00
Marek Marczykowski
8b29a09986 dom0/dispvm: icons for DispVM
Beautiful icons thanks to Agnieszka Kostrzewa!
2012-03-07 17:04:25 +01:00
Joanna Rutkowska
77a1eed064 version 2.0.6 2012-03-07 11:05:14 +01:00
Joanna Rutkowska
11575e7fbe Merge branch 'master' of git://git.qubes-os.org/marmarek/core into hvm
Conflicts:
	version_dom0
	version_vm
2012-03-06 22:25:32 +01:00
Joanna Rutkowska
1cba083205 Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-03-06 22:25:07 +01:00
Marek Marczykowski
c17893e0d2 version 1.7.14 2012-03-06 16:07:39 +01:00
Marek Marczykowski
694fdd361a Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core 2012-03-06 16:01:12 +01:00