Don't ask for X session on SSH conn
This commit is contained in:
		
							parent
							
								
									6b2f00d4f0
								
							
						
					
					
						commit
						72ca23231c
					
				
							
								
								
									
										18
									
								
								zlogin
								
								
								
								
							
							
						
						
									
										18
									
								
								zlogin
								
								
								
								
							|  | @ -66,15 +66,15 @@ if [ ${USER} != "root" ] && [ $(command -v startx) ]; then | |||
|   # If it's a VC console and | ||||
|   # no X session already launch and | ||||
|   # no ~/.noxorg file exist | ||||
|   if [ -n `tty | grep '/dev/tty'` ] && [ -z "`ps aux|grep "start[x]"`" ] && [ ! -f ~/.noxorg ];then | ||||
|     echo "Aucune session X11 détecté, voulez vous en lancer une ? [O|n]" | ||||
|     getc start_x | ||||
|     if [ `echo "$start_x" | grep "n"` ];then | ||||
|       echo "X11 ne sera pas lancé." | ||||
|     else | ||||
|       `startx -- :1 vt1` | ||||
|     fi | ||||
|   fi | ||||
| 	if [ -z "${SSH_TTY}" ] && [ -z "$(pidof /usr/lib/xorg/Xorg)" ] && [ ! -f ~/.noxorg ];then | ||||
| 		echo "Aucune session X11 détectée, voulez vous en lancer une ? [O|n]" | ||||
| 		getc start_x | ||||
| 		if [ `echo "$start_x" | grep "n"` ];then | ||||
| 			echo "X11 ne sera pas lancé." | ||||
| 		else | ||||
| 			`startx -- :1 vt1` | ||||
| 		fi | ||||
| 	fi | ||||
| fi | ||||
| 
 | ||||
| # Keychain {{{ | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue