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
Marek Marczykowski
fa905c764d
Merge branch 'master' into hvm
2012-03-03 02:19:02 +01:00
Marek Marczykowski
23e1e1db1f
vm/network: place anti-spoof rules in 'raw' table
2012-03-03 01:30:04 +01:00
Marek Marczykowski
6610b22f97
vm/network: replace route in more elegant way
2012-03-03 01:26:06 +01:00
Joanna Rutkowska
2062a937b4
Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm
2012-03-02 16:46:39 +01:00
Marek Marczykowski
9904a42203
Merge branch 'master' into hvm
2012-03-02 16:31:01 +01:00
Marek Marczykowski
1b4f6859b6
Merge branch 'master' into hvm
...
Conflicts:
dom0/qvm-core/qubes.py
dom0/qvm-tools/qvm-prefs
2012-03-02 16:21:48 +01:00
Joanna Rutkowska
402aae03a5
Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm
2012-03-02 14:48:41 +01:00
Joanna Rutkowska
f181dcb5b5
version 2.0.3
2012-03-02 02:33:05 +01:00
Joanna Rutkowska
cc7b423242
Merge branch 'master' of git://git.qubes-os.org/marmarek/core into hvm
2012-03-02 02:29:29 +01:00
Joanna Rutkowska
d51ba63b81
Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm
2012-03-02 02:25:24 +01:00
Joanna Rutkowska
00b0bd6d42
Merge branch 'master' of git://git.qubes-os.org/joanna/core into hvm
...
Conflicts:
version_dom0
version_vm
2012-03-02 02:24:37 +01:00
Marek Marczykowski
67369b170b
vm/dom-updates: always use --resolve
...
Required when update needs some additional packages
2012-03-02 00:34:36 +01:00
Marek Marczykowski
5dcaa52350
Merge branch 'master' into hvm
2012-03-01 23:40:31 +01:00
Joanna Rutkowska
33c8c83cd9
version 2.0.2
2012-03-01 12:46:18 +01:00
Joanna Rutkowska
0e0ce9188b
Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm
2012-03-01 12:45:21 +01:00
Joanna Rutkowska
57e4423cac
version 1.7.13
2012-02-29 10:36:42 +01:00
Marek Marczykowski
a20709db45
Merge branch 'master' into hvm
2012-02-29 03:58:29 +01:00
Marek Marczykowski
2d925b4aa4
Merge branch 'master' into hvm
2012-02-27 15:14:21 +01:00
Joanna Rutkowska
3239c7f0bc
version 2.0.1
2012-02-27 15:02:36 +01:00
Joanna Rutkowska
1b5434a13e
Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm
2012-02-27 15:00:54 +01:00
Joanna Rutkowska
08cde34d01
version 2.0.0
2012-02-27 13:31:42 +01:00
Joanna Rutkowska
a848e03715
Merge branch 'master' of git://git.qubes-os.org/marmarek/core into hvm
2012-02-27 13:30:14 +01:00
Joanna Rutkowska
4b3bb9f436
Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core
2012-02-27 13:17:48 +01:00
Marek Marczykowski
cd45ef1de6
vm/yum.repo: use separate key for unstable repo
2012-02-26 13:10:04 +01:00
Marek Marczykowski
41a0366719
vm/network: do not fail when route already exists - override it
2012-02-24 17:10:16 +01:00
Marek Marczykowski
366e59a8de
version 1.7.12
2012-02-23 09:41:56 +01:00
Marek Marczykowski
4bb485ea68
vm/dom0-update: suppress annoying yum warning ( #437 )
...
This is workaround of yum bug: when --installroot given its also set different
config path (inside this install root), but then issue warning because implicit
config path is different than explicit --config option (which was empty).
2012-02-14 21:08:48 +01:00
Marek Marczykowski
19db3f4f28
version 1.7.11
2012-02-13 15:55:10 +01:00
Marek Marczykowski
1b92fc877e
vm/firewall: do not fail when one VMs rules failed
2012-02-13 15:47:34 +01:00
Marek Marczykowski
e7571b5523
Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core
2012-02-07 03:22:52 +01:00
Marek Marczykowski
0dac162e34
vm/mimeopen: merge user defaults with system one ( #423 )
2012-02-06 19:09:37 +01:00
Marek Marczykowski
381c0e0757
vm/mimeopen: add missing misc-post-stop.sh script ( #423 )
2012-02-06 19:08:45 +01:00
Marek Marczykowski
c3ee25ef10
vm/mimeopen: save mimetype defaults for DispVM ( #423 )
2012-02-06 19:08:08 +01:00
Marek Marczykowski
f8def2de66
vm: do not ignore file extension when selecting file editor ( #423 )
2012-02-06 15:03:43 +01:00
Marek Marczykowski
431e350ffe
vm/spec: fix file permissions
2012-02-06 12:58:02 +01:00
Joanna Rutkowska
977dab3b0e
Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core
2012-02-01 22:58:12 +01:00
Marek Marczykowski
e405b3ac79
Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core
2012-02-01 19:42:31 +01:00
Joanna Rutkowska
afab6193cf
Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core
...
Conflicts:
dom0/pm-utils/01qubes-sync-vms-clock
2012-02-01 19:01:55 +01:00
Joanna Rutkowska
04976255f4
version 1.7.8
2012-01-30 15:42:27 +01:00
Joanna Rutkowska
8c6546c5a6
Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core
2012-01-30 15:39:28 +01:00
