Update dhcp and vlan scripts to be more precise: (#155)

## Description


Scripts now only work off specific interfaces instead of manipulating all interfaces.

## Why is this needed



Fixes: #

## How Has This Been Tested?





## How are existing users impacted? What migration steps/scripts do we need?





## Checklist:

I have:

- [ ] updated the documentation and/or roadmap (if required)
- [ ] added unit or e2e tests
- [ ] provided instructions on how to upgrade

Author: mergify[bot]

.github/workflows/ci.yaml

@@ -50,7 +50,10 @@ jobs:
         run: nix-shell --run .github/workflows/formatters-and-linters.sh
 
       - name: Build Hook Tarballs
-        run: nix-shell --run 'make TAG=${{steps.commitid.outputs.short}} dist'
+        run: |
+          # fixes "write /run/user/1001/355792648: no space left on device" error
+          sudo mount -o remount,size=3G /run/user/1001 || true
+          nix-shell --run 'make TAG=${{steps.commitid.outputs.short}} dist'
 
       - name: Publish Hook
         if: github.ref == 'refs/heads/main'

files/dhcp.sh

@@ -7,19 +7,21 @@
 # false: run the dhcp client as a service
 set -x
 
+parse_cmdline() {
+	c=$(cat /proc/cmdline)
+	c="${c##*"$1"=}"
+	c="${c%% *}"
+	echo "$c"
+}
+
 run_dhcp_client() {
 	one_shot="$1"
 	al="eth*"
 
-	# shellcheck disable=SC2013
-	for x in $(cat /proc/cmdline); do
-		# shellcheck disable=SC2022
-		echo "$x" | grep -qe 'vlan_id*' || continue
-		vlan_id="${x#vlan_id=}"
-		if [ -n "$vlan_id" ]; then
-			al="eth*.*"
-		fi
-	done
+	vlan_id=$(parse_cmdline vlan_id)
+	if [ -n "$vlan_id" ]; then
+		al="eth*.*"
+	fi
 
 	# Boots send kernel command line parameter "ip=dhcp", this causes the system to configure the network interface(s) with DHCP.
 	# When an environment's network configuration has this machine connected a trunked interface with a default/native VLAN, the

files/vlan.sh

@@ -1,24 +1,29 @@
-#!/bin/sh
+#!/bin/bash
 
 # This script will set up VLAN interfaces if `vlan_id=` in `/proc/cmdline` has a value
 set -x
 
+parse_cmdline() {
+	c=$(cat /proc/cmdline)
+	c="${c##*"$1"=}"
+	c="${c%% *}"
+	echo "$c"
+}
+
 add_vlan_interface() {
-	# shellcheck disable=SC2013
-	for param in $(cat /proc/cmdline); do
-		# shellcheck disable=SC2022
-		echo "$param" | grep -qe 'vlan_id*' || continue
-		vlan_id="${param#vlan_id=}"
-		if [ -n "$vlan_id" ]; then
-			for ifname in $(ip -4 -o link show | awk -F': ' '{print $2}'); do
-				[ "$ifname" = "lo" ] && continue
-				[ "$ifname" = "docker0" ] && continue
-				ip link add link "$ifname" name "$ifname.$vlan_id" type vlan id "$vlan_id"
-				ip link set "$ifname.$vlan_id" up
-			done
-			return
+	vlan_id=$(parse_cmdline vlan_id)
+	if [ -n "$vlan_id" ]; then
+		hw_addr=$(parse_cmdline hw_addr)
+		if [ -n "$hw_addr" ]; then
+			ifname=$(ip -br link | awk '$3 ~ /'"${hw_addr}"'/ {print $1}')
+			if [ -n "$ifname" ]; then
+				ip link set dev "${ifname}" up || true
+				ip link add link "${ifname}" name "${ifname}.${vlan_id}" type vlan id "${vlan_id}" || true
+				ip link set "${ifname}.${vlan_id}" up || true
+				return
+			fi
 		fi
-	done
+	fi
 }
 
 # we always return true so that a failure here doesn't block the next container service from starting. Ideally, we always