mirror of
				https://github.com/vdsm/virtual-dsm.git
				synced 2025-11-04 08:54:51 +08:00 
			
		
		
		
	fix: Convert dashes in custom MAC addresses (#626)
This commit is contained in:
		
							parent
							
								
									f412580a4a
								
							
						
					
					
						commit
						f24ba41930
					
				@ -216,7 +216,8 @@ getInfo() {
 | 
				
			|||||||
    VM_NET_MAC=$(echo "$HOST" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:11:32:\3:\4:\5/')
 | 
					    VM_NET_MAC=$(echo "$HOST" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:11:32:\3:\4:\5/')
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  VM_NET_MAC="${VM_NET_MAC,,//-/:}"
 | 
					  VM_NET_MAC="${VM_NET_MAC,,}"
 | 
				
			||||||
 | 
					  VM_NET_MAC="${VM_NET_MAC//-/:}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if [[ ${#VM_NET_MAC} == 12 ]]; then
 | 
					  if [[ ${#VM_NET_MAC} == 12 ]]; then
 | 
				
			||||||
    m="$VM_NET_MAC"
 | 
					    m="$VM_NET_MAC"
 | 
				
			||||||
 | 
				
			|||||||
@ -166,9 +166,12 @@ _graceful_shutdown() {
 | 
				
			|||||||
  finish "$code" && return "$code"
 | 
					  finish "$code" && return "$code"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					PROCESS="${APP,,}"
 | 
				
			||||||
 | 
					PROCESS="${PROCESS// /-}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MON_OPTS="\
 | 
					MON_OPTS="\
 | 
				
			||||||
        -pidfile $QEMU_PID \
 | 
					        -pidfile $QEMU_PID \
 | 
				
			||||||
        -name ${APP,,// /-},process=${APP,,// /-},debug-threads=on \
 | 
					        -name $PROCESS,process=$PROCESS,debug-threads=on \
 | 
				
			||||||
        -monitor telnet:localhost:$QEMU_PORT,server,nowait,nodelay"
 | 
					        -monitor telnet:localhost:$QEMU_PORT,server,nowait,nodelay"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [[ "$CONSOLE" != [Yy]* ]]; then
 | 
					if [[ "$CONSOLE" != [Yy]* ]]; then
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user