Commit Graph

1987 Commits

Author SHA1 Message Date
Marek Marczykowski
c7b8ea57f8 Merge remote-tracking branch 'alex/hvm' into hvm 2012-07-25 02:56:51 +02:00
Marek Marczykowski
6cbbc8afee 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
077c74782c 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
8f49a3d213 Merge remote-tracking branch 'joanna/master' 2012-07-23 22:16:42 +02:00
Marek Marczykowski
aa1b1e86a8 vm/prepare-dvm: wait for Xorg in more deterministic way (#636) 2012-07-22 01:23:45 +02:00
Marek Marczykowski
861b522d5c 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
Joanna Rutkowska
574393410a Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-07-20 19:46:06 +02:00
Joanna Rutkowska
f0ca597814 Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-07-20 16:45:35 +02:00
Marek Marczykowski
9e72a46e8c dom0/meminfo-writer: fork into background after first info sent to qmemman (#635) 2012-07-20 16:42:12 +02:00
Marek Marczykowski
49072ce570 dom0/meminfo-writer: fork into background after first info sent to qmemman (#635) 2012-07-20 16:41:26 +02:00
Joanna Rutkowska
a353794031 Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-07-18 10:59:01 +02:00
Marek Marczykowski
41f672a748 Merge remote-tracking branch 'alex/hvm' into hvm 2012-07-17 16:29:23 +02:00
Joanna Rutkowska
c75b5fcabc version 1.7.36 2012-07-16 14:29:31 +02:00
Joanna Rutkowska
499e9cca8d Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-07-16 14:25:11 +02:00
Joanna Rutkowska
0e49436ef4 version 1.7.35 2012-07-16 14:24:52 +02:00
Marek Marczykowski
c8f3f737f5 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
f9c1c7e986 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
Marek Marczykowski
8129032c9e vm: implement qubes.GetAppmenus to reduce code duplication
As one-liner services are now real one-line, just do it.
2012-07-15 02:41:23 +02:00
Marek Marczykowski
55130c0dee vm: simplify qubes.VMShell service
Now additional wrapper not required to skip cmdline argument
2012-07-15 02:41:23 +02:00
Marek Marczykowski
58a12f951c dom0+vm/qrexec-services: pass remote domain via env variable not argument
Most qrexec services doesn't use remote domain name, as policy is enforced
earlier. So pass it in way that will allow use of generic command as qrexec
service.
2012-07-15 02:41:23 +02:00
Marek Marczykowski
294e3c6369 vm: implement qubes.GetAppmenus to reduce code duplication
As one-liner services are now real one-line, just do it.
2012-07-15 02:26:09 +02:00
Marek Marczykowski
38bc4c6c7c vm: simplify qubes.VMShell service
Now additional wrapper not required to skip cmdline argument
2012-07-15 02:04:17 +02:00
Marek Marczykowski
51ad63e26f dom0+vm/qrexec-services: pass remote domain via env variable not argument
Most qrexec services doesn't use remote domain name, as policy is enforced
earlier. So pass it in way that will allow use of generic command as qrexec
service.
2012-07-14 22:54:23 +02:00
Joanna Rutkowska
dfe56000b1 Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-07-13 14:51:25 +02:00
Joanna Rutkowska
5a00577da5 Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-07-13 14:51:22 +02:00
Marek Marczykowski
6dd31ff87e Merge remote-tracking branch 'alex/hvm' into hvm 2012-07-13 14:49:51 +02:00
Marek Marczykowski
bec4afc919 vm: export SuspendPre and SuspendPost qrexec services (#617)
1. Try to use NetworkManager sleep command instead of shutting it down
2. Move sleep action details (which is VM-specific) to VM
3. Export it as qrexec service(s)
2012-07-13 14:44:11 +02:00
Marek Marczykowski
5292944a73 vm: export SuspendPre and SuspendPost qrexec services (#617)
1. Try to use NetworkManager sleep command instead of shutting it down
2. Move sleep action details (which is VM-specific) to VM
3. Export it as qrexec service(s)
2012-07-13 14:40:52 +02:00
Joanna Rutkowska
786e5a86a8 version 1.7.34 2012-07-13 13:32:29 +02:00
Joanna Rutkowska
332113c745 Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-07-13 13:25:55 +02:00
Marek Marczykowski
3af500fc80 vm: provide dispvm-dotfiles and dispvm-prerun.sh in rpm package (#620) 2012-07-12 14:22:44 +02:00
Marek Marczykowski
f26f6ba754 vm: provide dispvm-dotfiles and dispvm-prerun.sh in rpm package (#620) 2012-07-12 14:21:44 +02:00
Joanna Rutkowska
7285d4f404 version 1.7.33 2012-07-12 13:41:49 +02:00
Marek Marczykowski
6d0cc13c13 vm/system: ensure that DispVM savefile have pagecache populated (#620)
This is done by readahead, so just let it done its work before suspend.
2012-07-12 03:56:09 +02:00
Marek Marczykowski
c336586fae vm/systemd: disable additional useless services (#620)
Most of them relay on direct network acces, which isn't true on Qubes.
2012-07-12 03:56:09 +02:00
Marek Marczykowski
654fb64a74 vm/spec: remove dupplicated commnds, suppress error message 2012-07-12 03:56:09 +02:00
Marek Marczykowski
821d853abb vm/file-editor: load session environment (#620)
Especially set DBUS socket to allow interprocess communication instead of
spawning new instances or timeouts.
2012-07-12 03:56:09 +02:00
Marek Marczykowski
8944986b5a vm/system: ensure that DispVM savefile have pagecache populated (#620)
This is done by readahead, so just let it done its work before suspend.
2012-07-12 03:54:41 +02:00
Marek Marczykowski
c05a3f0093 vm/systemd: disable additional useless services (#620)
Most of them relay on direct network acces, which isn't true on Qubes.
2012-07-12 03:54:41 +02:00
Marek Marczykowski
4f3f427e10 vm/spec: remove dupplicated commnds, suppress error message 2012-07-12 03:54:41 +02:00
Marek Marczykowski
1b00952d44 vm/file-editor: load session environment (#620)
Especially set DBUS socket to allow interprocess communication instead of
spawning new instances or timeouts.
2012-07-12 03:45:20 +02:00
Marek Marczykowski
17aec638c2 Merge branch 'hvm' of ssh://gitpro.qubes-os.org/var/lib/qubes/git/joanna/core into hvm 2012-07-09 15:55:29 +02:00
Marek Marczykowski
5ee694f4d3 vm/spec: disable pam_systemd only in trigger
The %post part is unnecessary.
2012-07-09 15:54:33 +02:00
Marek Marczykowski
78df05afe1 Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core 2012-07-09 15:54:14 +02:00
Marek Marczykowski
accf5663ed vm/spec: disable pam_systemd only in trigger
The %post part is unnecessary.
2012-07-09 15:52:42 +02:00
Marek Marczykowski
4d9898aa69 makefile: fix clean target 2012-07-07 02:45:56 +02:00
Marek Marczykowski
23ef728a7c makefile: fix clean target 2012-07-07 02:45:32 +02:00
Joanna Rutkowska
b3604d94fb Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm 2012-07-06 11:15:18 +02:00
Joanna Rutkowska
28e12902a0 version 1.7.32 2012-07-06 10:32:27 +02:00
Joanna Rutkowska
625d092b48 Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core 2012-07-06 10:20:01 +02:00