Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							d87265851c 
							
						 
					 
					
						
						
							
							Merge branch 'spring-merge' of ssh://git.qubes-os.org/var/lib/qubes/git/rafal/core  
						
						
						
					 
					
						2011-03-24 16:43:13 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							f1a8887d11 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.qubes-os.org/joanna/core  
						
						
						
					 
					
						2011-03-24 16:41:49 -04:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							57fd6c49bb 
							
						 
					 
					
						
						
							
							Removed obsolete code, dom0 side  
						
						... 
						
						
						
						Just like the previous commit, it is related to switch to
qrexec-based file copy. 
						
					 
					
						2011-03-24 17:18:10 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							769213e019 
							
						 
					 
					
						
						
							
							Removed obsolete code, in appvm.  
						
						
						
					 
					
						2011-03-24 17:13:21 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							e2efae5286 
							
						 
					 
					
						
						
							
							Merge branch 'spring-merge' of git.qubes-os.org:/var/lib/qubes/git/rafal/core  
						
						
						
					 
					
						2011-03-24 11:51:43 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							2d37b3e508 
							
						 
					 
					
						
						
							
							Create a separate package with libraries.  
						
						
						
					 
					
						2011-03-24 11:39:44 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							2c7478dab8 
							
						 
					 
					
						
						
							
							Merge branch 'spring-merge' of git.qubes-os.org:/var/lib/qubes/git/rafal/core  
						
						
						
					 
					
						2011-03-24 10:17:15 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							fac1b78ec0 
							
						 
					 
					
						
						
							
							One more build order fix.  
						
						
						
					 
					
						2011-03-24 10:03:39 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							5f4fcedf55 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.qubes-os.org/joanna/core  
						
						
						
					 
					
						2011-03-23 20:12:13 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							b95dd0fcaa 
							
						 
					 
					
						
						
							
							Enable build on appvm.  
						
						
						
					 
					
						2011-03-23 19:55:35 -04:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							01b75b5987 
							
						 
					 
					
						
						
							
							Enable build on non-appvm.  
						
						
						
					 
					
						2011-03-23 17:47:35 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							30df10cf18 
							
						 
					 
					
						
						
							
							Merge branch 'spring-merge' of git.qubes-os.org:/var/lib/qubes/git/rafal/core  
						
						
						
					 
					
						2011-03-23 17:15:15 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							0b208e8664 
							
						 
					 
					
						
						
							
							Move libs and /var/run/qubes out of qubes-netvm  
						
						... 
						
						
						
						They are already in core-appvm package. 
						
					 
					
						2011-03-23 11:48:06 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							5350e5cc5b 
							
						 
					 
					
						
						
							
							move qrexec_agent out of core-netvm.spec  
						
						... 
						
						
						
						It is already in core-appvm. 
						
					 
					
						2011-03-23 11:46:53 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							488eda21d9 
							
						 
					 
					
						
						
							
							Merge branch 'blockless' into spring-merge  
						
						... 
						
						
						
						Conflicts:
	appvm/Makefile
	appvm/qubes_core
	netvm/qubes_core
	rpm_spec/core-appvm.spec
	rpm_spec/core-netvm.spec 
						
					 
					
						2011-03-21 13:54:35 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							4c5d9f56c7 
							
						 
					 
					
						
						
							
							Tag RPMs with dist info  
						
						
						
					 
					
						2011-03-16 19:14:42 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							4087b1d052 
							
						 
					 
					
						
						
							
							Package qvm-copy-to-vm2*, too.  
						
						
						
					 
					
						2011-03-16 16:47:32 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							1892bef66f 
							
						 
					 
					
						
						
							
							Require xen 3.4.3-6 with fixed /etc/xen/scripts/block  
						
						
						
					 
					
						2011-03-16 11:32:51 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							1c505589c1 
							
						 
					 
					
						
						
							
							Move xenstore-watch for VM from AppVM to common. Add to core-common.spec  
						
						
						
					 
					
						2011-03-16 11:41:18 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							01a1aeb403 
							
						 
					 
					
						
						
							
							Do not try to disable 'reboot' service  
						
						
						
					 
					
						2011-03-16 11:41:18 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							33ed1ecad8 
							
						 
					 
					
						
						
							
							Drop forced fedora version from requires  
						
						
						
					 
					
						2011-03-16 11:41:18 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							2818f6dfe1 
							
						 
					 
					
						
						
							
							Move xenstore-watch for VM from AppVM to common. Add to core-common.spec  
						
						
						
					 
					
						2011-03-15 19:47:26 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							84b1a186ff 
							
						 
					 
					
						
						
							
							Added qfile-unpacker and qfile-daemon  
						
						
						
					 
					
						2011-03-15 16:43:43 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							f0a7620449 
							
						 
					 
					
						
						
							
							Package qfile-agent-dvm, too.  
						
						
						
					 
					
						2011-03-15 16:19:42 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							b8d983cfa9 
							
						 
					 
					
						
						
							
							Added qfile-agent  
						
						
						
					 
					
						2011-03-15 16:07:00 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							6b6e6b7520 
							
						 
					 
					
						
						
							
							Added new qvm-open-in-dvm, aka qvm-open-in-dvm2  
						
						... 
						
						
						
						Small, childless bash script. 
						
					 
					
						2011-03-14 11:25:18 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							5d3c43e4fa 
							
						 
					 
					
						
						
							
							created qfile-daemon-dvm  
						
						... 
						
						
						
						Mostly code from qfilexchgd; it will be removed soon. 
						
					 
					
						2011-03-14 10:43:09 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							b04b36af2c 
							
						 
					 
					
						
						
							
							Register VM services also on update  
						
						
						
					 
					
						2011-03-11 23:42:49 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							3d845e4f61 
							
						 
					 
					
						
						
							
							Add qubes_netwatcher to proxyvm spec  
						
						
						
					 
					
						2011-03-11 23:33:15 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							de5e06e462 
							
						 
					 
					
						
						
							
							Remove duplicated entry in core-dom0.spec  
						
						
						
					 
					
						2011-03-11 02:02:13 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							08b4490b91 
							
						 
					 
					
						
						
							
							NetVM, AppVM, ProxyVM from single template - VM side (missing files...)  
						
						
						
					 
					
						2011-03-11 01:42:42 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							c7a832a279 
							
						 
					 
					
						
						
							
							NetVM, AppVM, ProxyVM from single template - VM side  
						
						... 
						
						
						
						Modify VM packages to:
- do not conflicts
- starts services if its VM type need it
Added core-proxyvm (firewall) and core-commonvm (common parts) packages. 
						
					 
					
						2011-03-11 01:38:04 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							c2214e854c 
							
						 
					 
					
						
						
							
							Added dvm_file_editor.  
						
						... 
						
						
						
						It works with qrexec - reads/writes data from stdin/stdout. 
						
					 
					
						2011-03-10 16:50:40 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							7e29c397aa 
							
						 
					 
					
						
						
							
							Add 30-qubes_external_ip to netvm.spec  
						
						
						
					 
					
						2011-03-10 16:09:37 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							a21e0d37c6 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/smoku/core  
						
						... 
						
						
						
						Conflicts:
	dom0/qvm-core/qubes.py 
						
					 
					
						2011-03-10 16:05:48 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							f1a7df6e95 
							
						 
					 
					
						
						
							
							Implemented mechanism to trigger predefined execution in dom0.  
						
						... 
						
						
						
						Processes in AppVM can ask qrexec-agent to send a
MSG_AGENT_TO_SERVER_TRIGGER_EXEC message to qrexec-daemon.
The latter will execute predefined program. It is useful for
the purpose of file copy; the predefined program will create
a connected qfile-daemon<->qfile-agent pair. 
						
					 
					
						2011-03-10 15:41:31 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							a71b846ee2 
							
						 
					 
					
						
						
							
							Added FirewallVM related VM scripts  
						
						
						
					 
					
						2011-03-09 20:50:13 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							f263aa6b7c 
							
						 
					 
					
						
						
							
							Moved vchan and u2mfn code to core.  
						
						
						
					 
					
						2011-03-08 12:24:47 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							bef584c248 
							
						 
					 
					
						
						
							
							Restore rev 1 in core-dom0.spec  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							167c30aa6e 
							
						 
					 
					
						
						
							
							Start xend and xenstored during package installation  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							d1cfcac49c 
							
						 
					 
					
						
						
							
							Add BR to core-appvm.spec  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							b98dffc965 
							
						 
					 
					
						
						
							
							qrexec* tools, initial version  
						
						
						
					 
					
						2011-03-04 16:32:58 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							e104f82e36 
							
						 
					 
					
						
						
							
							Update TemplateVM with running AppVM: part 1  
						
						... 
						
						
						
						snapshot and origin device type for xen 
						
					 
					
						2011-02-26 03:42:55 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							8ca63ba176 
							
						 
					 
					
						
						
							
							Start xend and xenstored during package installation  
						
						
						
					 
					
						2011-02-11 00:34:46 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							b3511c678a 
							
						 
					 
					
						
						
							
							Use "conflict" instead of "requires gui" in rpm spec.  
						
						
						
					 
					
						2010-11-18 14:33:18 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							1e7c66337c 
							
						 
					 
					
						
						
							
							Require gui-dom0 >= 1.1.13 that knows it doesn't own /var/{log,run}/qubes dirs  
						
						
						
					 
					
						2010-10-06 14:16:27 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							28880cae52 
							
						 
					 
					
						
						
							
							Merged triggers.  
						
						
						
					 
					
						2010-10-06 13:08:17 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							1f5300da85 
							
						 
					 
					
						
						
							
							Move /var/log/qubes and /var/run/qubes to qubes-core rpm from qubes-gui  
						
						... 
						
						
						
						Because /var/log/qubes is used in qubes-core %post. While at it, do the same with
/var/run/qubes. 
						
					 
					
						2010-10-06 11:00:52 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							7c1babe8aa 
							
						 
					 
					
						
						
							
							Do not error when qvm-get-default-netvm returns empty string.  
						
						... 
						
						
						
						It happens when installing qubes-core-dom0 for the first time. 
						
					 
					
						2010-10-06 10:55:32 +02:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							28e1f962e5 
							
						 
					 
					
						
						
							
							core dom0 rpm: restart qubes_netvm only when using netvm in Dom0  
						
						... 
						
						
						
						If we use a separate netvm, then core update in Dom0 doesn't really change the networking,
worse, if we restarted netvm it would get another XID, which would break our DispVM savefile.
One day we should fix it! 
						
					 
					
						2010-10-04 17:51:01 +02:00