Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							a10abc5c9d 
							
						 
					 
					
						
						
							
							Merge tag 'smk_a8cef51b' of ssh://git.qubes-os.org/var/lib/qubes/git/smoku/core  
						
						... 
						
						
						
						Conflicts:
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-ls 
						
					 
					
						2011-03-10 14:14:48 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							1914854e88 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/marmarek/core  
						
						... 
						
						
						
						Conflicts:
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-prefs
	dom0/qvm-tools/qvm-template-commit 
						
					 
					
						2011-03-09 17:23:32 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							e35fccef35 
							
						 
					 
					
						
						
							
							Fix AppVm constructior  
						
						
						
					 
					
						2011-03-09 15:24:54 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							c1bd86142c 
							
						 
					 
					
						
						
							
							NetVM and ProxyVM based on template: part 1 (core)  
						
						
						
					 
					
						2011-03-06 17:06:45 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							13c3a04755 
							
						 
					 
					
						
						
							
							Fix typo 'templete'  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							e9bd19299f 
							
						 
					 
					
						
						
							
							Update firewall iptables file during VM start  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							f33fcff372 
							
						 
					 
					
						
						
							
							Implemented iptables rules file generator  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							0c1b6ca4b0 
							
						 
					 
					
						
						
							
							Store firewal rules in Python data structure  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							aa536fdbda 
							
						 
					 
					
						
						
							
							Properly set FwVM xenstore files  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							bd05975a53 
							
						 
					 
					
						
						
							
							Removed trailing whitespace  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							8e465a13b5 
							
						 
					 
					
						
						
							
							Implemented firewall_conf storage  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							026a109d1f 
							
						 
					 
					
						
						
							
							Fixed setting netvm of FWVM  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							60caf9af7f 
							
						 
					 
					
						
						
							
							Refactored QubesVm.is_*vm() methods  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							cba89a8747 
							
						 
					 
					
						
						
							
							Show FirewallVMs in qvm-ls  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							d207ecacea 
							
						 
					 
					
						
						
							
							Implemented QubesFirewallVm subclass of QubesNetVm  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							24c0778154 
							
						 
					 
					
						
						
							
							gitignore files - add build products  
						
						
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							b778fa3210 
							
						 
					 
					
						
						
							
							Add typo in qvm-template-commit  
						
						... 
						
						
						
						As in original classes... 
						
					 
					
						2011-03-06 14:06:24 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							14aaccbc5f 
							
						 
					 
					
						
						
							
							Update TemplateVM with running AppVM: part 2  
						
						... 
						
						
						
						- support for template modify in qvm-core
- tool for commit changes to template 
						
					 
					
						2011-03-06 14:06:15 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							a8cef51b67 
							
						 
					 
					
						
						
							
							Use new, simplified firewall rules data scheme  
						
						
						
					 
					
						2011-03-03 22:40:36 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							0a8249d83f 
							
						 
					 
					
						
						
							
							Update firewall iptables file during VM start  
						
						
						
					 
					
						2011-03-02 15:04:11 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							45f84b1713 
							
						 
					 
					
						
						
							
							Implemented iptables rules file generator  
						
						
						
					 
					
						2011-03-02 15:03:21 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							6083384e6d 
							
						 
					 
					
						
						
							
							Store firewal rules in Python data structure  
						
						
						
					 
					
						2011-03-02 15:02:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							353f04e186 
							
						 
					 
					
						
						
							
							Properly set FwVM xenstore files  
						
						
						
					 
					
						2011-03-02 15:01:30 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							d758eb8258 
							
						 
					 
					
						
						
							
							Removed trailing whitespace  
						
						
						
					 
					
						2011-03-02 15:00:19 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							c3bf11062f 
							
						 
					 
					
						
						
							
							gitignore files - add build products  
						
						
						
					 
					
						2011-03-02 11:58:22 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							143f1519a8 
							
						 
					 
					
						
						
							
							Add typo in qvm-template-commit  
						
						... 
						
						
						
						As in original classes... 
						
					 
					
						2011-03-02 11:52:19 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							6db640dbfe 
							
						 
					 
					
						
						
							
							Update TemplateVM with running AppVM: part 2  
						
						... 
						
						
						
						- support for template modify in qvm-core
- tool for commit changes to template 
						
					 
					
						2011-03-02 11:33:22 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							a450e51126 
							
						 
					 
					
						
						
							
							Implemented firewall_conf storage  
						
						
						
					 
					
						2011-02-21 18:13:27 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							a088e14244 
							
						 
					 
					
						
						
							
							Fixed setting netvm of FWVM  
						
						
						
					 
					
						2011-02-11 00:34:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							053ca36ca8 
							
						 
					 
					
						
						
							
							Refactored QubesVm.is_*vm() methods  
						
						
						
					 
					
						2011-02-11 00:34:46 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							4297c1284a 
							
						 
					 
					
						
						
							
							Show FirewallVMs in qvm-ls  
						
						
						
					 
					
						2011-02-09 21:21:41 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							8c82361f5e 
							
						 
					 
					
						
						
							
							Implemented QubesFirewallVm subclass of QubesNetVm  
						
						
						
					 
					
						2011-02-09 21:21:14 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							1fccf9c309 
							
						 
					 
					
						
						
							
							Use delayed_transaction_seq from sender, not receiver.  
						
						... 
						
						
						
						Apparently, qvm-copy-to-vm when receiver already has an incoming pendrive
worked only by coincidence. 
						
					 
					
						2010-10-28 12:39:03 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							18dc0b67c7 
							
						 
					 
					
						
						
							
							dom0: do not do mem-set for dom0 in init.d/qubes_core  
						
						
						
					 
					
						2010-10-04 15:20:41 +02:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							e91ee0acb3 
							
						 
					 
					
						
						
							
							dom0 init.d/qubes_core: kill some processes on stop()  
						
						
						
					 
					
						2010-10-04 15:20:09 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							862bd1f11c 
							
						 
					 
					
						
						
							
							DVM: do not mem-set 400  
						
						... 
						
						
						
						qmemman will do the job automagically. 
						
					 
					
						2010-09-30 18:26:35 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							28fbb48845 
							
						 
					 
					
						
						
							
							Attach/detach pci devices from netvm upon resume/suspend  
						
						
						
					 
					
						2010-09-30 18:22:26 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							ece96ba3fb 
							
						 
					 
					
						
						
							
							Make qfilexchgd listen for change in /vm to detect vm start/stop  
						
						... 
						
						
						
						... instead of watching /local/domain, which changes whenever meminfo-wwriter
pushes data. 
						
					 
					
						2010-09-27 17:42:34 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							90e3f4ffd8 
							
						 
					 
					
						
						
							
							Add reset_vm_configs.py script  
						
						
						
					 
					
						2010-09-27 16:58:02 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							2244ea95bf 
							
						 
					 
					
						
						
							
							Separate create_config_file() function in qubes.py  
						
						
						
					 
					
						2010-09-27 16:53:17 +02:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							ba59ac733e 
							
						 
					 
					
						
						
							
							Merge branch 'qmemman' of git://qubes-os.org/rafal/core  
						
						... 
						
						
						
						Conflicts:
	dom0/qvm-core/qubes.py 
						
					 
					
						2010-09-23 12:31:25 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							11eafede31 
							
						 
					 
					
						
						
							
							Make qubes_prepare_saved_domain.sh output less scary for [normal] users  
						
						
						
					 
					
						2010-09-22 11:15:22 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							0217dba40e 
							
						 
					 
					
						
						
							
							Completed dvm->setupdvm name transition  
						
						
						
					 
					
						2010-09-22 10:24:57 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							7aa55affcf 
							
						 
					 
					
						
						
							
							renamed:    qubes_dvm -> qubes_setupdvm  
						
						
						
					 
					
						2010-09-22 10:22:45 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							2a4abafd1b 
							
						 
					 
					
						
						
							
							Removed empty function from qubes_dvm  
						
						
						
					 
					
						2010-09-22 10:21:54 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							4e067aa503 
							
						 
					 
					
						
						
							
							Slightly change the savefile update notification message.  
						
						
						
					 
					
						2010-09-21 22:28:14 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							c0656720ab 
							
						 
					 
					
						
						
							
							DVM: if needed, qfileexchgd will recreate DVM savefile  
						
						... 
						
						
						
						It would be nice to have some progress notification, as dvm setup is
slow. 
						
					 
					
						2010-09-21 22:23:38 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							e13e5027c3 
							
						 
					 
					
						
						
							
							qubes_dvm init.d script  
						
						... 
						
						
						
						We want to set up a default dvm if needed at boot time; for this,
the default netvm must have been already started. Therefore, we
need a qubes_dvm script, that executes after qubes_netvm. 
						
					 
					
						2010-09-21 21:46:11 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							c22a6ebb84 
							
						 
					 
					
						
						
							
							DVM: make qvm-get-default-template use the default template, if asked  
						
						... 
						
						
						
						Via options --default-template and --default-script 
						
					 
					
						2010-09-21 18:40:15 +02:00