mgetadmin/arc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: rework (remove single nic function and fake all mac)

Browse Source 
Signed-off-by: AuxXxilium <info@auxxxilium.tech>
This commit is contained in:
AuxXxilium
2024-03-26 19:33:54 +01:00
parent f3b5f1c8da
commit 0e7bb3b8bf
1 changed files with 12 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
files/initrd/opt/arc/include/network.sh
View File

@@ -2,47 +2,13 @@
function getnet() {
ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
if [ "${ARCPATCH}" = "true" ]; then
# Ask for Arc Settings
dialog --clear --backtitle "$(backtitle)" \
--nocancel --title "Arc Setting" \
--menu "Choose an Option" 7 50 0 \
1 "Apply Arc Patch for eth0" \
2 "Apply Arc Patch for all NIC" \
2>"${TMP_PATH}/resp"
resp="$(<"${TMP_PATH}/resp")"
[ -z "${resp}" ] && return 1
if [ ${resp} -eq 1 ]; then
# Install with Arc Patch - Check for model config and set custom Mac Address
[ -f "${TMP_PATH}/opts" ] && rm -f "${TMP_PATH}/opts"
touch "${TMP_PATH}/opts"
ARCMACNUM=1
while true; do
ARCMAC="$(readModelKey "${MODEL}" "arc.mac${ARCMACNUM}")"
if [ -n "${ARCMAC}" ]; then
echo "${ARCMAC} mac${ARCMACNUM}" >>"${TMP_PATH}/opts"
ARCMACNUM=$((${ARCMACNUM} + 1))
else
break
fi
done
dialog --clear --backtitle "$(backtitle)" \
--nocancel --title "Mac Setting" \
--menu "Choose a MAC for eth0" 0 0 0 \
--file "${TMP_PATH}/opts" \
2>"${TMP_PATH}/resp"
resp="$(<"${TMP_PATH}/resp")"
[ -z "${resp}" ] && return 1
MAC="${resp}"
writeConfigKey "mac.eth0" "${MAC}" "${USER_CONFIG_FILE}"
elif [ ${resp} -eq 2 ]; then
ARCMACNUM=1
for ETH in ${ETHX}; do
ARCMAC="$(readModelKey "${MODEL}" "arc.mac${ARCMACNUM}")"
[ -n "${ARCMAC}" ] && writeConfigKey "mac.${ETH}" "${ARCMAC}" "${USER_CONFIG_FILE}"
[ -z "${ARCMAC}" ] && break
ARCMACNUM=$((${ARCMACNUM} + 1))
done
fi
ARCMACNUM=1
for ETH in ${ETHX}; do
ARCMAC="$(readModelKey "${MODEL}" "arc.mac${ARCMACNUM}")"
[ -n "${ARCMAC}" ] && writeConfigKey "mac.${ETH}" "${ARCMAC}" "${USER_CONFIG_FILE}"
[ -z "${ARCMAC}" ] && break
ARCMACNUM=$((${ARCMACNUM} + 1))
done
elif [ "${ARCPATCH}" = "false" ]; then
for ETH in ${ETHX}; do
MACS=$(generateMacAddress "${MODEL}" 1)
@@ -72,15 +38,12 @@ function getnet() {
dialog --clear --backtitle "$(backtitle)" \
--nocancel --title "Macsys Setting" \
--menu "Choose an Option\n* Recommended Option" 10 50 0 \
1 "Arc - Use Arc Mac Settings for DSM *" \
2 "Hardware - Use Hardware Mac for DSM" \
3 "Custom - Use Custom Mac for DSM" \
1 "Hardware - Use Hardware Mac for DSM *" \
2 "Custom - Use Custom Mac for DSM" \
2>"${TMP_PATH}/resp"
resp="$(<"${TMP_PATH}/resp")"
[ -z "${resp}" ] && return 1
if [ ${resp} -eq 1 ]; then
writeConfigKey "arc.macsys" "arc" "${USER_CONFIG_FILE}"
elif [ ${resp} -eq 2 ]; then
if [ ${resp} -eq 2 ]; then
writeConfigKey "arc.macsys" "hardware" "${USER_CONFIG_FILE}"
elif [ ${resp} -eq 3 ]; then
writeConfigKey "arc.macsys" "custom" "${USER_CONFIG_FILE}"
@@ -89,8 +52,8 @@ function getnet() {
# Ask for Macsys
dialog --clear --backtitle "$(backtitle)" \
--nocancel --title "Macsys Setting" \
--menu "Choose an Option" 7 50 0 \
1 "Hardware - Use Hardware Mac for DSM" \
--menu "Choose an Option\n* Recommended Option" 7 50 0 \
1 "Hardware - Use Hardware Mac for DSM *" \
2 "Custom - Use Custom Mac for DSM" \
2>"${TMP_PATH}/resp"
resp="$(<"${TMP_PATH}/resp")"