mirror of
				https://github.com/juanfont/headscale.git
				synced 2025-11-04 01:51:04 +01:00 
			
		
		
		
	fix relogin test, pass accept route flag
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
		
							parent
							
								
									1766e6b5df
								
							
						
					
					
						commit
						12a04f9459
					
				@ -316,6 +316,7 @@ func (t *TailscaleInContainer) Execute(
 | 
				
			|||||||
		options...,
 | 
							options...,
 | 
				
			||||||
	)
 | 
						)
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
 | 
							// log.Printf("command issued: %s", strings.Join(command, " "))
 | 
				
			||||||
		// log.Printf("command stderr: %s\n", stderr)
 | 
							// log.Printf("command stderr: %s\n", stderr)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if stdout != "" {
 | 
							if stdout != "" {
 | 
				
			||||||
@ -343,6 +344,7 @@ func (t *TailscaleInContainer) Login(
 | 
				
			|||||||
		"--login-server=" + loginServer,
 | 
							"--login-server=" + loginServer,
 | 
				
			||||||
		"--authkey=" + authKey,
 | 
							"--authkey=" + authKey,
 | 
				
			||||||
		"--hostname=" + t.hostname,
 | 
							"--hostname=" + t.hostname,
 | 
				
			||||||
 | 
							"--accept-routes",
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if t.withSSH {
 | 
						if t.withSSH {
 | 
				
			||||||
@ -381,6 +383,7 @@ func (t *TailscaleInContainer) LoginWithURL(
 | 
				
			|||||||
		"up",
 | 
							"up",
 | 
				
			||||||
		"--login-server=" + loginServer,
 | 
							"--login-server=" + loginServer,
 | 
				
			||||||
		"--hostname=" + t.hostname,
 | 
							"--hostname=" + t.hostname,
 | 
				
			||||||
 | 
							"--accept-routes",
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	_, stderr, err := t.Execute(command)
 | 
						_, stderr, err := t.Execute(command)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user