Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9eafa57539 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'marmarek/master' into core3-devel  
						
						... 
						
						
						
						The following list is bollocks. There were many, many more.
Conflicts:
    core-modules/003QubesTemplateVm.py
    core-modules/005QubesNetVm.py
    core/qubes.py
    core/storage/__init__.py
    core/storage/xen.py
    doc/qvm-tools/qvm-pci.rst
    doc/qvm-tools/qvm-prefs.rst
    qubes/tools/qmemmand.py
    qvm-tools/qvm-create
    qvm-tools/qvm-prefs
    qvm-tools/qvm-start
    tests/__init__.py
    vm-config/xen-vm-template-hvm.xml
This commit took 2 days (26-27.01.2016) and put our friendship to test.
    --Wojtek and Marek 
						
					 
					
						2016-03-03 01:13:51 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f1a0b1af39 
							
						 
					 
					
						
						
							
							qubes/tools: add qvm-run, qvm-{,un}pause  
						
						... 
						
						
						
						Also change convention of calling main(): now command returns its
numeric value instead of bool.
Also fixed QSB#13
fixes  QubesOS/qubes-issues#1226  
						
					 
					
						2015-12-29 03:43:08 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7b30361fa6 
							
						 
					 
					
						
						
							
							qubes/tools: add qubes-prefs  
						
						... 
						
						
						
						fixes  QubesOS/qubes-issues#1209  
					
						2015-12-24 00:48:17 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fb6acb5f6b 
							
						 
					 
					
						
						
							
							core3: documentation fixes  
						
						
						
					 
					
						2015-10-05 23:57:03 +02:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							15713cbf46 
							
						 
					 
					
						
						
							
							qubes/tools: rewrite qvm-kill  
						
						... 
						
						
						
						Also new function, `error_runtime` for common parser.
fixes  QubesOS/qubes-issues#1222  
						
					 
					
						2015-10-05 18:06:02 +02:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							b0be1ad584 
							
						 
					 
					
						
						
							
							qubes/tools: qvm-start rewritten from original  
						
						
						
					 
					
						2015-10-05 12:46:14 +02:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							b0af95fa2b 
							
						 
					 
					
						
						
							
							qvm-prefs: support resetting values  
						
						
						
					 
					
						2015-10-05 12:46:13 +02:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e7cba0214f 
							
						 
					 
					
						
						
							
							qubes/tools: qvm-prefs  
						
						
						
					 
					
						2015-10-05 12:46:13 +02:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							067f033af6 
							
						 
					 
					
						
						
							
							qubes/tools/qvm-create: Add internal --no-root option  
						
						... 
						
						
						
						And documentation fixes. 
						
					 
					
						2015-09-28 18:20:28 +02:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ff7d89700a 
							
						 
					 
					
						
						
							
							qubes/tools: port qvm-create  
						
						
						
					 
					
						2015-06-30 17:18:24 +02:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fd0107f11a 
							
						 
					 
					
						
						
							
							new tool: qubes-create  
						
						... 
						
						
						
						At present it just creates default qubes.xml (empty barring labels and AdminVM).
In the future it can be evolved into backend for firstboot. 
						
					 
					
						2015-06-29 17:39:28 +02:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e50ca5131f 
							
						 
					 
					
						
						
							
							doc: move manpages to common directory  
						
						
						
					 
					
						2015-06-29 17:39:28 +02:00