mirror of
https://github.com/RROrg/rr.git
synced 2025-06-21 05:51:05 +08:00
Merge pull request #108 from fbelavenuto/dev
Fix bugs into MAC-related stuff, organizing modules
This commit is contained in:
commit
42e4fa09de
@ -24,7 +24,7 @@ ENV SHELL=/bin/bash \
|
|||||||
|
|
||||||
RUN apt update --yes && \
|
RUN apt update --yes && \
|
||||||
apt install --yes --no-install-recommends --no-install-suggests \
|
apt install --yes --no-install-recommends --no-install-suggests \
|
||||||
ca-certificates nano curl bc kmod git \
|
ca-certificates nano curl bc kmod git gettext texinfo autopoint \
|
||||||
build-essential make ncurses-dev libssl-dev autogen automake pkg-config libtool xsltproc gperf && \
|
build-essential make ncurses-dev libssl-dev autogen automake pkg-config libtool xsltproc gperf && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
@ -72,10 +72,10 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
|
|||||||
writeConfigKey "addons.misc" "" "${USER_CONFIG_FILE}"
|
writeConfigKey "addons.misc" "" "${USER_CONFIG_FILE}"
|
||||||
writeConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
|
writeConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
|
||||||
# Initialize with real MAC
|
# Initialize with real MAC
|
||||||
writeConfigKey "original-mac" "${MACF}" "${USER_CONFIG_FILE}"
|
|
||||||
writeConfigKey "cmdline.netif_num" "1" "${USER_CONFIG_FILE}"
|
writeConfigKey "cmdline.netif_num" "1" "${USER_CONFIG_FILE}"
|
||||||
writeConfigKey "cmdline.mac1" "${MACF}" "${USER_CONFIG_FILE}"
|
writeConfigKey "cmdline.mac1" "${MACF}" "${USER_CONFIG_FILE}"
|
||||||
fi
|
fi
|
||||||
|
writeConfigKey "original-mac" "${MACF}" "${USER_CONFIG_FILE}"
|
||||||
|
|
||||||
# Set custom MAC if defined
|
# Set custom MAC if defined
|
||||||
MAC1=`readConfigKey "cmdline.mac1" "${USER_CONFIG_FILE}"`
|
MAC1=`readConfigKey "cmdline.mac1" "${USER_CONFIG_FILE}"`
|
||||||
|
@ -367,7 +367,7 @@ function cmdlineMenu() {
|
|||||||
dialog --backtitle "`backtitle`" --title "User cmdline" \
|
dialog --backtitle "`backtitle`" --title "User cmdline" \
|
||||||
--inputbox "Type a custom MAC address" 0 0 "${CMDLINE['mac1']}"\
|
--inputbox "Type a custom MAC address" 0 0 "${CMDLINE['mac1']}"\
|
||||||
2>${TMP_PATH}/resp
|
2>${TMP_PATH}/resp
|
||||||
[ $? -ne 0 ] && continue
|
[ $? -ne 0 ] && break
|
||||||
MAC="`<"${TMP_PATH}/resp"`"
|
MAC="`<"${TMP_PATH}/resp"`"
|
||||||
[ -z "${MAC}" ] && MAC="`readConfigKey "original-mac" "${USER_CONFIG_FILE}"`"
|
[ -z "${MAC}" ] && MAC="`readConfigKey "original-mac" "${USER_CONFIG_FILE}"`"
|
||||||
MAC1="`echo "${MAC}" | sed 's/://g'`"
|
MAC1="`echo "${MAC}" | sed 's/://g'`"
|
||||||
|
BIN
files/board/arpl/p3/addons/dbgutils/all.tgz
Normal file
BIN
files/board/arpl/p3/addons/dbgutils/all.tgz
Normal file
Binary file not shown.
14
files/board/arpl/p3/addons/dbgutils/manifest.yml
Normal file
14
files/board/arpl/p3/addons/dbgutils/manifest.yml
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
version: 1
|
||||||
|
name: dbgutils
|
||||||
|
description: "Binaries to facilitate debug in the junior mode"
|
||||||
|
all:
|
||||||
|
install-script: "install.sh"
|
||||||
|
copy: "all"
|
||||||
|
available-for:
|
||||||
|
bromolow-3.10.108:
|
||||||
|
apollolake-4.4.180:
|
||||||
|
broadwell-4.4.180:
|
||||||
|
broadwellnk-4.4.180:
|
||||||
|
denverton-4.4.180:
|
||||||
|
geminilake-4.4.180:
|
||||||
|
v1000-4.4.180:
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user