feat: Generate unique MAC address (#611) (3c31bc91) · Commits · git-mirror / virtual-dsm

src/display.sh

+3 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,9 @@ if [[ "$GPU" != [Yy1]* ]] \|\| [[ "$ARCH" != "amd64" ]]; then

		fi

		DISPLAY_OPTS="-display egl-headless,rendernode=/dev/dri/renderD128 -vga $VGA"
		[[ "${VGA,,}" == "virtio" ]] && VGA="virtio-vga"
		DISPLAY_OPTS="-display egl-headless,rendernode=/dev/dri/renderD128"
		DISPLAY_OPTS="$DISPLAY_OPTS -vga none -device $VGA"

		[ ! -d /dev/dri ] && mkdir -m 755 /dev/dri

src/network.sh

+17 −11

Original line number	Diff line number	Diff line
		@@ -3,8 +3,8 @@ set -Eeuo pipefail

		# Docker environment variables

		: "${MAC:=""}"
		: "${DHCP:="N"}"
		: "${MAC:="02:11:32:AA:BB:CC"}"

		: "${VM_NET_DEV:=""}"
		: "${VM_NET_TAP:="dsm"}"
		@@ -33,7 +33,7 @@ configureDHCP() {
		fi

		while ! ip link set "$VM_NET_TAP" up; do
		info "Waiting for address to become available..."
		info "Waiting for MAC address $VM_NET_MAC to become available..."
		sleep 2
		done

		@@ -128,7 +128,7 @@ configureNAT() {
		ip address add ${VM_NET_IP%.}.1/24 broadcast ${VM_NET_IP%.}.255 dev dockerbridge

		while ! ip link set dockerbridge up; do
		info "Waiting for address to become available..."
		info "Waiting for IP address to become available..."
		sleep 2
		done

		@@ -136,7 +136,7 @@ configureNAT() {
		ip tuntap add dev "$VM_NET_TAP" mode tap

		while ! ip link set "$VM_NET_TAP" up promisc on; do
		info "Waiting for tap to become available..."
		info "Waiting for TAP to become available..."
		sleep 2
		done

		@@ -211,14 +211,20 @@ getInfo() {
		error "$ADD_ERR -e \"VM_NET_DEV=NAME\" to specify another interface name." && exit 27
		fi

		VM_NET_MAC="${VM_NET_MAC//-/:}"
		if [ -z "$VM_NET_MAC" ]; then
		# Generate MAC address based on Docker container ID in hostname
		VM_NET_MAC=$(echo "$HOST" \| md5sum \| sed 's/^$..$$..$$..$$..$$..$.*$/02:11:32:\3:\4:\5/')
		fi

		VM_NET_MAC="${VM_NET_MAC,,//-/:}"

		if [[ ${#VM_NET_MAC} == 12 ]]; then
		m="$VM_NET_MAC"
		VM_NET_MAC="${m:0:2}:${m:2:2}:${m:4:2}:${m:6:2}:${m:8:2}:${m:10:2}"
		fi

		if [[ ${#VM_NET_MAC} != 17 ]]; then
		error "Invalid mac address: '$VM_NET_MAC', should be 12 or 17 digits long!" && exit 28
		error "Invalid MAC address: '$VM_NET_MAC', should be 12 or 17 digits long!" && exit 28
		fi

		GATEWAY=$(ip r \| grep default \| awk '{print $3}')
		@@ -242,16 +248,16 @@ getInfo
		html "Initializing network..."

		if [[ "$DEBUG" == [Yy1]* ]]; then
		info "Container IP is $IP with gateway $GATEWAY on interface $VM_NET_DEV" && echo
		info "Host: $HOST IP: $IP Gateway: $GATEWAY Interface: $VM_NET_DEV MAC: $VM_NET_MAC"
		[ -f /etc/resolv.conf ] && cat /etc/resolv.conf
		echo
		fi

		if [[ "$DHCP" == [Yy1]* ]]; then

		if [[ "$GATEWAY" == "172."* ]]; then
		if [[ "$DEBUG" != [Yy1]* ]]; then
		if [[ "$GATEWAY" == "172."* ]] && [[ "$DEBUG" != [Yy1]* ]]; then
		error "You can only enable DHCP while the container is on a macvlan network!" && exit 26
		fi
		fi

		# Configuration for DHCP IP
		configureDHCP

src/reset.sh

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ TEMPLATE="/var/www/index.html"
		FOOTER1="$APP for Docker v$(</run/version)"
		FOOTER2="<a href='$SUPPORT'>$SUPPORT</a>"

		HOST=$(hostname -s)
		KERNEL=$(uname -r \| cut -b 1)
		MINOR=$(uname -r \| cut -d '.' -f2)
		ARCH=$(dpkg --print-architecture)

src/serial.sh

+15 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,21 @@ set -Eeuo pipefail
		: "${HOST_MODEL:=""}"
		: "${GUEST_SERIAL:=""}"

		if [ -n "$HOST_MAC" ]; then

		HOST_MAC="${HOST_MAC//-/:}"

		if [[ ${#HOST_MAC} == 12 ]]; then
		m="$HOST_MAC"
		HOST_MAC="${m:0:2}:${m:2:2}:${m:4:2}:${m:6:2}:${m:8:2}:${m:10:2}"
		fi

		if [[ ${#HOST_MAC} != 17 ]]; then
		error "Invalid HOST_MAC address: '$HOST_MAC', should be 12 or 17 digits long!" && exit 28
		fi

		fi

		HOST_ARGS=()
		HOST_ARGS+=("-cpu=$CPU_CORES")
		HOST_ARGS+=("-cpu_arch=$HOST_CPU")