Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
577 Commits 1 Branch 0 Tags 6.4 MiB
debc4231c2
Commit Graph

577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marek Marczykowski
debc4231c2 vm version 1.7.19 - sync with master branch 2012-04-20 00:14:09 +02:00
Marek Marczykowski
8f7cd6e650 Merge branch 'master' into hvm 
Conflicts:
	dom0/qvm-tools/qvm-prefs
	dom0/qvm-tools/qvm-start
	version_dom0
	version_vm
 2012-04-18 17:12:11 +02:00
Marek Marczykowski
f4a08e81f4 Merge branch 'hvm' of ssh://gitpro.qubes-os.org/var/lib/qubes/git/joanna/core into hvm 2012-04-18 17:07:17 +02:00
Marek Marczykowski
6c441e7755 Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core 2012-04-18 16:54:10 +02:00
Joanna Rutkowska
617be22931 Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-04-15 16:39:07 +02:00
Joanna Rutkowska
aed5496638 version 1.7.19 2012-04-15 16:22:22 +02:00
Joanna Rutkowska
be3ff05867 Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-04-15 16:21:50 +02:00
Marek Marczykowski
d0296d9783 vm: load block backend in every VM (#516) 2012-04-04 11:55:48 +02:00
Marek Marczykowski
8c7bfba386 vm: load block backend in every VM (#516) 2012-04-03 17:41:48 +02:00
Joanna Rutkowska
9fbba91a7f Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-03-31 19:54:11 +02:00
Joanna Rutkowska
daa60f334a version 1.7.18 2012-03-31 19:53:14 +02:00
Joanna Rutkowska
cb9b76d039 Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-03-31 19:52:28 +02:00
Marek Marczykowski
3b55fc51e8 dom0+vm: qvm-block --attach-file 
Allow to attach disk image from different VM as block device. File attached
with qvm-block -A will be visible as loopX device and as such can be detached.
File path will be in device description.
 2012-03-31 19:04:50 +02:00
Joanna Rutkowska
bdf6016b5a New signing key cleanup (removed the unused encryption key) 2012-03-31 14:57:26 +02:00
Joanna Rutkowska
069ae8e520 Update Qubes Signing key 2012-03-31 13:04:22 +02:00
Joanna Rutkowska
260e0c439a Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-03-29 20:31:14 +02:00
Marek Marczykowski
a1ae0bba89 vm/init: Use the same default services for TemplateVM as for AppVM (#503) 
Actually it already was done in traditional init.d script, so do the same in
systemd version.
 2012-03-28 00:49:18 +02:00
Marek Marczykowski
9a55fb3765 vm/init: Use the same default services for TemplateVM as for AppVM (#503) 
Actually it already was done in traditional init.d script, so do the same in
systemd version.
 2012-03-28 00:43:59 +02:00
Marek Marczykowski
2ea9a70efe dom0+vm: qvm-block --attach-file 
Allow to attach disk image from different VM as block device. File attached
with qvm-block -A will be visible as loopX device and as such can be detached.
File path will be in device description.
 2012-03-26 20:29:49 +02:00
Joanna Rutkowska
cf8de69668 Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-03-21 11:31:57 +01:00
Joanna Rutkowska
2a8905916d Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-03-16 10:24:48 +01:00
Marek Marczykowski
b495853fd3 Merge branch 'hvm' of ssh://gitpro.qubes-os.org/var/lib/qubes/git/joanna/core into hvm 2012-03-10 03:19:02 +01:00
Marek Marczykowski
47c144f8f5 Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core 2012-03-09 17:26:14 +01:00
Marek Marczykowski
4d09708976 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
Joanna Rutkowska
0dc66321f7 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
cd3b40c407 Merge branch 'master' into hvm 
Conflicts:
	version_dom0
	version_vm
 2012-03-09 10:19:34 +01:00
Joanna Rutkowska
70ad4146e1 version 1.7.17 2012-03-09 09:46:06 +01:00
Marek Marczykowski
703c74397f vm/netwatcher: fix watch 2012-03-09 01:54:16 +01:00
Marek Marczykowski
9de77d7fe4 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
4401c3e525 vm/init.d: make firewall and netwatcher service consistent with systemd 2012-03-09 01:50:18 +01:00
Marek Marczykowski
aa0d767e8a vm/netwatcher: watch also for netvm change (#478) 2012-03-09 01:01:30 +01:00
Marek Marczykowski
31ccbce992 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
531449b16f 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
Joanna Rutkowska
f846d890b5 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
Joanna Rutkowska
0ad42ab63f version 1.7.16 2012-03-08 21:45:55 +01:00
Joanna Rutkowska
281d2e3870 Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-03-08 21:40:30 +01:00
Marek Marczykowski
060b55ba8a 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
ba7822975d 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
c9cc8d6058 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
fccdc63473 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
2b3939ab64 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
8a7906a016 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
Joanna Rutkowska
a2df8d8a7c version 1.7.15 2012-03-08 12:44:41 +01:00
Joanna Rutkowska
2e0cc83c1a 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
f7b923db6a 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
a2afb6e054 version 1.7.14 2012-03-06 16:07:39 +01:00
Marek Marczykowski
5fda94f958 Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core 2012-03-06 16:01:12 +01:00
Marek Marczykowski
51a3a5ffe4 Merge branch 'master' into hvm 2012-03-06 14:47:20 +01:00
Marek Marczykowski
21543dbb4c Merge branch 'master' into hvm 
Conflicts:
	dom0/qvm-core/qubes.py
 2012-03-06 02:21:52 +01:00
Marek Marczykowski
811b597f2b Merge branch 'hvm' of ssh://gitpro.qubes-os.org/var/lib/qubes/git/joanna/core into hvm 2012-03-04 22:34:22 +01:00