Merge branch 'master' of github.com:redox-os/redox
This commit is contained in:
		
						commit
						dd170473f9
					
				
					 1 changed files with 2 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -15,7 +15,8 @@ else
 | 
			
		|||
	ifneq ($(bridge),)
 | 
			
		||||
		QEMUFLAGS+=-netdev bridge,br=$(bridge),id=net0 -device e1000,netdev=net0,id=nic0
 | 
			
		||||
	else
 | 
			
		||||
		QEMUFLAGS+=-net nic,model=e1000 -net user -net dump,file=build/network.pcap
 | 
			
		||||
		QEMUFLAGS+=-netdev user,id=net0 -device e1000,netdev=net0 \
 | 
			
		||||
					-object filter-dump,id=f1,netdev=net0,file=build/network.pcap
 | 
			
		||||
	endif
 | 
			
		||||
	ifeq ($(net),redir)
 | 
			
		||||
		QEMUFLAGS+=-redir tcp:8023::8023 -redir tcp:8080::8080
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue