Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							a88e104b6e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core  
						
						
						
					 
					
						2011-04-04 18:47:08 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d079594b 
							
						 
					 
					
						
						
							
							Don't set template on StandaloneVM - only use it when copying template files ( #189 )  
						
						
						
					 
					
						2011-04-04 18:41:02 +02:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							b779fadda6 
							
						 
					 
					
						
						
							
							Revert "Start qrexec daemon when VM is running (but qrexec not)"  
						
						... 
						
						
						
						This functionality has already been implemented by:
d6bdb8588397403a8e45 
						
					 
					
						2011-04-04 09:35:48 +02:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							3f31a5f3a7 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core  
						
						
						
					 
					
						2011-04-04 09:33:31 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							398734dad2 
							
						 
					 
					
						
						
							
							Internal VMs (hidden in qubes-manager, menus etc) - used for DispVM template ( #155 )  
						
						
						
					 
					
						2011-04-03 17:47:20 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							e22f303f79 
							
						 
					 
					
						
						
							
							Warn user when restoring backup as root ( #159 )  
						
						
						
					 
					
						2011-04-01 02:11:40 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							136a65e0be 
							
						 
					 
					
						
						
							
							Fix indentation - duplicate VMs warning message ( #159 )  
						
						
						
					 
					
						2011-04-01 02:10:50 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							97403a8e45 
							
						 
					 
					
						
						
							
							Start qrexec daemon when VM is running (but qrexec not)  
						
						... 
						
						
						
						This takes place ex. when VM started from qubes-manager.
There is little sense in implementing full start procedure in every qubes tool,
so start it here, not in qubes-manager. 
						
					 
					
						2011-04-01 01:23:57 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							d6bdb85883 
							
						 
					 
					
						
						
							
							Start qrexec_daemon in vm.start()  
						
						... 
						
						
						
						Instead of three separate places - qvm-start, qvm-run, manager. 
						
					 
					
						2011-03-31 11:11:39 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							ece8cfa9f0 
							
						 
					 
					
						
						
							
							Show output from resize2fs, when running it in AppVM ( #5 )  
						
						
						
					 
					
						2011-03-31 02:40:45 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							6273c42faf 
							
						 
					 
					
						
						
							
							Recursive stop VMs, when stopping NetVM ( #172 )  
						
						... 
						
						
						
						Dependency resolving in qvm-core, recursive stopping only in qvm-run for now. 
						
					 
					
						2011-03-31 02:35:02 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							01ef2aff9e 
							
						 
					 
					
						
						
							
							Wait for device size change, before resize2fs ( #5 )  
						
						
						
					 
					
						2011-03-31 00:44:58 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							0d52b037f1 
							
						 
					 
					
						
						
							
							Changed network addresses to 10.137.0.0/16 ( #73 )  
						
						... 
						
						
						
						Also limit qid to 254 - should be enough and fits in one byte (in IP address) 
						
					 
					
						2011-03-27 12:58:38 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							14f0141214 
							
						 
					 
					
						
						
							
							Fix to long label for standalone VM  
						
						
						
					 
					
						2011-03-24 21:56:59 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							7dca7a5a32 
							
						 
					 
					
						
						
							
							Support for backup standalone VMs (add root.img, apps/); add firewall.xml to backup  
						
						
						
					 
					
						2011-03-24 21:37:30 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							8bdbed7bb8 
							
						 
					 
					
						
						
							
							Fix error handling in qvm-backup-restore  
						
						
						
					 
					
						2011-03-24 21:35:46 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							4723b9e2ef 
							
						 
					 
					
						
						
							
							Template name change option, reset config files, standalone vm restore ( #103 )  
						
						... 
						
						
						
						Recreate config file when requested but also when template name changed.
Restore full AppVM dir from backup - not only selected files. 
						
					 
					
						2011-03-24 21:34:04 -04:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							7f94cf2709 
							
						 
					 
					
						
						
							
							Merge branch 'spring-merge' of ssh://git.qubes-os.org/var/lib/qubes/git/rafal/core into spring-merge  
						
						
						
					 
					
						2011-03-23 19:45:59 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							0962eab45a 
							
						 
					 
					
						
						
							
							Cmdline tool to grow private.img ( #5 )  
						
						
						
					 
					
						2011-03-23 19:41:58 -04: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 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							a6ee9d66f5 
							
						 
					 
					
						
						
							
							qvm-backup-{,restore} - support for standalone VMs  
						
						... 
						
						
						
						Backup root.img instead of (non-existing) root-cow.img 
						
					 
					
						2011-03-18 22:24:08 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							823bd1ce0f 
							
						 
					 
					
						
						
							
							Use common image for swap and root-cow - volatile.img ( #118 )  
						
						... 
						
						
						
						This reduces xvd* devices count, so speeds up VM start.
Also swap-cow is no longer needed, so remove this additional dm-snapshot layer. 
						
					 
					
						2011-03-18 22:15:32 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							4e68c4cde9 
							
						 
					 
					
						
						
							
							Standalone VM ( #98 )  
						
						... 
						
						
						
						'updateable' property is now read-onlyr; updateable=True means that VM has own
root.img, not persistent root-cow.img. 
						
					 
					
						2011-03-16 18:45:02 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							ef6a3e576b 
							
						 
					 
					
						
						
							
							Parse tags %MEM% and %VCPUS% in {app,net}vm-template.conf ( #115 )  
						
						
						
					 
					
						2011-03-16 13:39:54 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							2b78538376 
							
						 
					 
					
						
						
							
							Merge git://git.qubes-os.org/joanna/core  
						
						
						
					 
					
						2011-03-16 11:29:55 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							5e2dd1c6ce 
							
						 
					 
					
						
						
							
							Revert "Do not add new vm to xen storage in qvm-create - it is done by core"  
						
						... 
						
						
						
						This reverts commit 72ddb5aae1 
						
					 
					
						2011-03-16 11:44:25 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							72ddb5aae1 
							
						 
					 
					
						
						
							
							Do not add new vm to xen storage in qvm-create - it is done by core  
						
						
						
					 
					
						2011-03-16 11:41:18 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							fa7e13c602 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core  
						
						
						
					 
					
						2011-03-15 22:57:27 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							63b06516b7 
							
						 
					 
					
						
						
							
							Do not add new vm to xen storage in qvm-create - it is done by core  
						
						
						
					 
					
						2011-03-15 18:51:31 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							14c48f5253 
							
						 
					 
					
						
						
							
							Merge commit '00ba6dd5b7441cf10f87f527f4ac7eb459cb0a08'  
						
						
						
					 
					
						2011-03-15 18:33:01 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							993d34e7d5 
							
						 
					 
					
						
						
							
							Allow labels for NetVM/ProxyVM. Require it in qvm-create.  
						
						
						
					 
					
						2011-03-15 18:28:28 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							f83daa49f9 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/smoku/core  
						
						
						
					 
					
						2011-03-14 22:44:04 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							00ba6dd5b7 
							
						 
					 
					
						
						
							
							Properly find root netvm in netvm chain  
						
						
						
					 
					
						2011-03-14 20:44:17 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							b8d98403ff 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core  
						
						
						
					 
					
						2011-03-14 13:15:48 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							2a72b293c4 
							
						 
					 
					
						
						
							
							ProxyVM type in qvm-ls  
						
						
						
					 
					
						2011-03-11 02:44:11 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							969b14b5ed 
							
						 
					 
					
						
						
							
							qvm-create: support for netvm and proxyvm  
						
						... 
						
						
						
						Move PCI config from qvm-add-netvm to qvm-core.
Remove qvm-add-netvm as useless when netvm is template-based 
						
					 
					
						2011-03-11 01:48:27 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							a7cc09071f 
							
						 
					 
					
						
						
							
							Make qubes_restore rexec-aware.  
						
						
						
					 
					
						2011-03-08 13:03:55 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							eb7821771e 
							
						 
					 
					
						
						
							
							In qvm-start, check $DISPLAY existence, too.  
						
						
						
					 
					
						2011-03-07 16:05:36 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							62d0127647 
							
						 
					 
					
						
						
							
							Integrate qrexec with qvm-run.  
						
						
						
					 
					
						2011-03-07 15:58:04 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							cba89a8747 
							
						 
					 
					
						
						
							
							Show FirewallVMs in qvm-ls  
						
						
						
					 
					
						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 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							d6f327492d 
							
						 
					 
					
						
						
							
							Start qrexec daemon and agent  
						
						
						
					 
					
						2011-03-04 17:19:51 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							a5c4a1626e 
							
						 
					 
					
						
						
							
							qvm-backup-restore: support for --skip-conflicting option  
						
						
						
					 
					
						2010-12-18 07:25:47 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							751e0b380a 
							
						 
					 
					
						
						
							
							qvm-backup: support --exclude option  
						
						
						
					 
					
						2010-11-28 16:30:26 +01: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