Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							b488ab0055 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core  
						
						
						
					 
					
						2011-03-31 13:30:05 +02:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							90423aae41 
							
						 
					 
					
						
						
							
							Use zenity instead of kdialog in appvm code  
						
						
						
					 
					
						2011-03-31 13:26:41 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							36447a4d95 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/joanna/core into spring-merge  
						
						
						
					 
					
						2011-03-31 10:01:05 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							746adcbbfd 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core into spring-merge  
						
						
						
					 
					
						2011-03-31 09:44:30 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							f6fbbfbfcb 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core  
						
						
						
					 
					
						2011-03-31 02:51:34 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							267331bab6 
							
						 
					 
					
						
						
							
							Stop only NM on suspend. ( #146 )  
						
						... 
						
						
						
						Also remove ip_forward setting from sysctl, so NM will not reset it on restart 
						
					 
					
						2011-03-31 00:19:41 +02:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							0b6cc603bd 
							
						 
					 
					
						
						
							
							version 1.5.4-appvm  
						
						
						
					 
					
						2011-03-30 17:42:36 +02:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							0eea01812c 
							
						 
					 
					
						
						
							
							Merge branch 'spring-merge' of git.qubes-os.org:/var/lib/qubes/git/rafal/core  
						
						
						
					 
					
						2011-03-30 17:37:49 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							4e332ab244 
							
						 
					 
					
						
						
							
							Actually add appvm/qvm-copy-to-vm  
						
						
						
					 
					
						2011-03-30 17:27:04 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							2be3267726 
							
						 
					 
					
						
						
							
							Implemented console qvm-copy-to-vm  
						
						... 
						
						
						
						It waits for the copy to finish, and is capable of killer
progress indicator. 
						
					 
					
						2011-03-30 17:25:57 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							0e7bd73d22 
							
						 
					 
					
						
						
							
							Renamed qvm-copy-to-vm2 to qvm-trigger-copy-to-vm  
						
						... 
						
						
						
						The new name describes the task of the script better. 
						
					 
					
						2011-03-30 16:48:48 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							1eee3cc505 
							
						 
					 
					
						
						
							
							core-appvm.spec: create /home/user/.gnome2/nautilus-scripts  
						
						... 
						
						
						
						And symlinks in it that will be visible in "scripts" context
menu of nautilus. 
						
					 
					
						2011-03-30 12:37:47 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							d82c597c82 
							
						 
					 
					
						
						
							
							qvm-copy-to-vm2.kde: calculate size of sparse files correctly  
						
						
						
					 
					
						2011-03-30 10:30:27 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							0851d12be9 
							
						 
					 
					
						
						
							
							qvm-copy-to-vm2.kde: prepare for a race in PROGRESS_FILE creation  
						
						... 
						
						
						
						Apparently a tight race may happen when PROGRESS_FILE has been created,
but not yet written to by qfile-agent. Check if its content are
sane before use. 
						
					 
					
						2011-03-30 10:28:25 +02:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							90f48776d6 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core  
						
						
						
					 
					
						2011-03-29 13:25:07 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							9f0d84a528 
							
						 
					 
					
						
						
							
							qfile-copy: try to produce only one error message  
						
						
						
					 
					
						2011-03-29 13:05:57 +02:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							7a792a7d03 
							
						 
					 
					
						
						
							
							version 1.5.3  
						
						
						
					 
					
						2011-03-29 11:03:34 +02:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							994899e6af 
							
						 
					 
					
						
						
							
							Add BuildRequires: xen-devel  
						
						
						
					 
					
						2011-03-29 11:02:29 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							3ed985d220 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/smoku/core into spring-merge  
						
						
						
					 
					
						2011-03-28 17:28:24 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							dd52750e87 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/joanna/core into spring-merge  
						
						
						
					 
					
						2011-03-28 17:28:08 +02:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							ad39a33496 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core into spring-merge  
						
						
						
					 
					
						2011-03-28 17:27:50 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							ef57528c1a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core  
						
						
						
					 
					
						2011-03-27 21:08:34 +02:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							c9205a6b4b 
							
						 
					 
					
						
						
							
							Propagate qubes_netvm_external_ip up in ProxyVM.  #116  
						
						
						
					 
					
						2011-03-26 11:33:04 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Sterna 
							
						 
					 
					
						
						
						
						
							
						
						
							4b3d17c15a 
							
						 
					 
					
						
						
							
							Create needed NetworkManager.conf in netvm.  #94  
						
						... 
						
						
						
						Also fixed qubes_fix_nm_conf.sh script. 
						
					 
					
						2011-03-26 11:33:04 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							735dbc179f 
							
						 
					 
					
						
						
							
							version 1.5.2  
						
						
						
					 
					
						2011-03-25 15:59:23 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							3217bff0b7 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core  
						
						
						
					 
					
						2011-03-25 15:51:26 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							c787309a40 
							
						 
					 
					
						
						
							
							Merge branch 'spring-merge' of git.qubes-os.org:/var/lib/qubes/git/rafal/core  
						
						
						
					 
					
						2011-03-25 15:49:18 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							6c2a6d4d4d 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							b3ed721734 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.qubes-os.org/joanna/core  
						
						
						
					 
					
						2011-03-24 16:41:49 -04:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							81257fff75 
							
						 
					 
					
						
						
							
							Removed obsolete code, in appvm.  
						
						
						
					 
					
						2011-03-24 17:13:21 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							582371d190 
							
						 
					 
					
						
						
							
							dvm_file_editor: correctly nuke children's stdin/out/err  
						
						
						
					 
					
						2011-03-24 14:33:43 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							d472c82c18 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							bf4b128fba 
							
						 
					 
					
						
						
							
							Create a separate package with libraries.  
						
						
						
					 
					
						2011-03-24 11:39:44 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							6de5f11e41 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							8da0ae3918 
							
						 
					 
					
						
						
							
							One more build order fix.  
						
						
						
					 
					
						2011-03-24 10:03:39 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							4050662357 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.qubes-os.org/joanna/core  
						
						
						
					 
					
						2011-03-23 20:12:13 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							1f92e9f746 
							
						 
					 
					
						
						
							
							gitignores  
						
						
						
					 
					
						2011-03-23 19:57:48 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							6c56fdc98b 
							
						 
					 
					
						
						
							
							Enable build on appvm.  
						
						
						
					 
					
						2011-03-23 19:55:35 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							51b0e00b7b 
							
						 
					 
					
						
						
							
							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 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							a45b9b4835 
							
						 
					 
					
						
						
							
							Enable build on non-appvm.  
						
						
						
					 
					
						2011-03-23 17:47:35 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							1726e81969 
							
						 
					 
					
						
						
							
							version 1.5.1  
						
						
						
					 
					
						2011-03-23 17:19:44 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							452cb48b1f 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							f4e0db623f 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core into spring-merge  
						
						
						
					 
					
						2011-03-23 16:47:05 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							3cd2af60f5 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							6a5262be42 
							
						 
					 
					
						
						
							
							move qrexec_agent out of core-netvm.spec  
						
						... 
						
						
						
						It is already in core-appvm. 
						
					 
					
						2011-03-23 11:46:53 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							7fb123db92 
							
						 
					 
					
						
						
							
							Move execution of qrexec_agent to qubes_core  
						
						... 
						
						
						
						Previously it was in both qubes_core_appvm and qubes_core_netvm;
somehow counterintuitively, qubes_core_netvm executes on appvm, too. So
move it to a common place. 
						
					 
					
						2011-03-23 11:34:01 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							518a7e53ad 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/smoku/core into spring-merge  
						
						
						
					 
					
						2011-03-23 09:23:38 +01:00 
						 
				 
			
				
					
						
							
							
								Rafal Wojtczuk 
							
						 
					 
					
						
						
						
						
							
						
						
							dfb499c025 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							2007e374c5 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							2b2e09881d 
							
						 
					 
					
						
						
							
							Autocommit template changes after template shutdown ( #96 )  
						
						
						
					 
					
						2011-03-18 18:54:14 -04:00