Commit Graph

2331 Commits

Author SHA1 Message Date
Marek Marczykowski
e4d15f55f1 Merge remote-tracking branch 'alex/hvm' into hvm 2012-07-25 02:56:51 +02:00
Marek Marczykowski
d1b827e1bd Merge branch 'master' into hvm
Conflicts:
	dom0/init.d/qubes_core
	rpm_spec/core-dom0.spec
	version_dom0
2012-07-25 02:52:00 +02:00
Marek Marczykowski
b691f57bbf vm: kernel-placeholder package to inhibit real kernel pkg in VM (#645)
Some packages depends on kernel (ex fuse, pulseaudio), but kernel in VM is
managed by dom0. Any hack like exlude or so on will break some things, so
install empty placeholder package to fulfill dependencies.
2012-07-23 23:17:50 +02:00
Marek Marczykowski
cc12b58c2e Merge remote-tracking branch 'joanna/master' 2012-07-23 22:16:42 +02:00
Marek Marczykowski
ad7da49e74 dom0/core: remove ugly hack in network-reconnect code (#637) 2012-07-22 01:33:08 +02:00
Marek Marczykowski
9c912694be vm/prepare-dvm: wait for Xorg in more deterministic way (#636) 2012-07-22 01:23:45 +02:00
Marek Marczykowski
6da61af323 dom0/backup-restore: fix netvm field in summary 2012-07-21 00:12:18 +02:00
Joanna Rutkowska
f2d8142823 version 1.7.41-dom0 2012-07-20 23:22:43 +02:00
Marek Marczykowski
6580fc70a7 Merge branch 'master' of git://git.qubes-os.org/joanna/core
on (#635)

Parse config and setup socket before fork.
2012-07-20 23:01:06 +02:00
Marek Marczykowski
a97458ad08 dom0/core: do not reset firewall on clone_attrs 2012-07-20 22:55:28 +02:00
Marek Marczykowski
dc95349145 dom0/backup-restore: fix verification of VMs in backup 2012-07-20 22:55:28 +02:00
Marek Marczykowski
e7477cfaf2 dom0/core: minor comments improvements 2012-07-20 22:55:28 +02:00
Marek Marczykowski
dbbb168b66 dom0/core: improve diagnostics of qmemman errors 2012-07-20 22:55:17 +02:00
Marek Marczykowski
130873071f dom0/core: do not reset firewall on clone_attrs 2012-07-20 22:54:53 +02:00
Marek Marczykowski
7f9d77b27e dom0/backup-restore: fix verification of VMs in backup 2012-07-20 22:54:12 +02:00
Marek Marczykowski
ea02bee444 dom0/core: minor comments improvements 2012-07-20 22:53:14 +02:00
Joanna Rutkowska
1f7e873768 Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-07-20 19:46:06 +02:00
Marek Marczykowski
abefe78197 dom0/core: improve diagnostics of qmemman errors 2012-07-20 16:49:19 +02:00
Joanna Rutkowska
00d4da8ee0 version 1.7.40-dom0 2012-07-20 16:47:36 +02:00
Joanna Rutkowska
6ae56d7e18 Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-07-20 16:45:35 +02:00
Marek Marczykowski
5ea32bd11b dom0/meminfo-writer: fork into background after first info sent to qmemman (#635) 2012-07-20 16:42:12 +02:00
Marek Marczykowski
148e5e55f7 dom0/qmemman: fork into background after daemon initialization (#635)
Parse config and setup socket before fork.
2012-07-20 16:42:11 +02:00
Marek Marczykowski
59a1fb96db dom0/meminfo-writer: fork into background after first info sent to qmemman (#635) 2012-07-20 16:41:26 +02:00
Marek Marczykowski
c2d20e59d0 dom0/qmemman: fork into background after daemon initialization (#635)
Parse config and setup socket before fork.
2012-07-20 16:32:17 +02:00
Joanna Rutkowska
47f297f411 version 1.7.39 2012-07-20 13:36:20 +02:00
Joanna Rutkowska
eb74c823d5 Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-07-20 13:34:49 +02:00
Marek Marczykowski
ba568ed3e9 dom0/core: use generic run() to wait for qubes-session
Especially use 'ignore_stderr' feature.
2012-07-20 13:17:37 +02:00
Marek Marczykowski
273032bfae dom0: add missing file 2012-07-20 13:09:20 +02:00
Marek Marczykowski
d5dbbd41cb dom0/qvm-tools: add missing imports 2012-07-20 13:09:07 +02:00
Marek Marczykowski
f98bf1d570 dom0: fix dirs permissions after xen upgrade 2012-07-20 13:08:18 +02:00
Marek Marczykowski
7071bf62bc dom0/core: use generic run() to wait for qubes-session
Especially use 'ignore_stderr' feature.
2012-07-20 13:06:26 +02:00
Joanna Rutkowska
ccbafffff1 version 1.7.38-dom0 2012-07-19 23:24:39 +02:00
Joanna Rutkowska
bf59971108 Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-07-19 18:55:20 +02:00
Marek Marczykowski
2ddd48f8e4 dom0/core: disable dynamic memory when VM have PCI devices assigned 2012-07-19 14:44:09 +02:00
Marek Marczykowski
406d233b6b dom0/core: disable dynamic memory when VM have PCI devices assigned 2012-07-19 14:43:24 +02:00
Joanna Rutkowska
7a8652057f version 1.7.37-dom0 2012-07-18 22:27:28 +02:00
Marek Marczykowski
cfd95575dd dom0: add missing file 2012-07-18 22:22:52 +02:00
Marek Marczykowski
b321d16336 dom0/qvm-tools: add missing imports 2012-07-18 18:10:08 +02:00
Marek Marczykowski
38e8b85b06 dom0: fix dirs permissions after xen upgrade 2012-07-18 12:46:36 +02:00
Joanna Rutkowska
69a50c86ca version 2.0.35 2012-07-18 11:02:30 +02:00
Joanna Rutkowska
a59ecf6897 Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-07-18 10:59:01 +02:00
Joanna Rutkowska
f0195e15af version 2.0.34 2012-07-18 10:58:35 +02:00
Marek Marczykowski
d8908c29d2 Merge remote-tracking branch 'alex/hvm' into hvm 2012-07-17 16:29:23 +02:00
Joanna Rutkowska
9be4d5b77b version 1.7.36 2012-07-16 14:29:31 +02:00
Joanna Rutkowska
57139ab46f Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-07-16 14:25:11 +02:00
Joanna Rutkowska
f5edc233e0 version 1.7.35 2012-07-16 14:24:52 +02:00
Marek Marczykowski
4b92f6390a dom0/qvm-core: ignore stderr from VM commands when not needed for sure (#626)
pam_systemd.so has a bug, which cause spurious '...killed' output on stderr.
2012-07-16 13:36:08 +02:00
Marek Marczykowski
0f6f445ece Revert "vm/spec: disable pam_systemd globally (#607)" (#626)
This reverts commit 8ec4b6963b71b95bc0cda6dd80d99bf60aa9caec.
This caused regression (#626).

Conflicts:

	rpm_spec/core-vm.spec
2012-07-16 13:36:08 +02:00
Marek Marczykowski
5637793fae dom0/qvm-core: ignore stderr from VM commands when not needed for sure (#626)
pam_systemd.so has a bug, which cause spurious '...killed' output on stderr.
2012-07-16 13:31:43 +02:00
Marek Marczykowski
eeabd3b371 Revert "vm/spec: disable pam_systemd globally (#607)" (#626)
This reverts commit 8ec4b6963b71b95bc0cda6dd80d99bf60aa9caec.
This caused regression (#626).

Conflicts:

	rpm_spec/core-vm.spec
2012-07-16 12:49:41 +02:00