Fix bugs into MAC-related stuff, organizing modules

files/board/arpl/overlayfs/opt/arpl/init.sh

@@ -72,10 +72,10 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
   writeConfigKey "addons.misc" "" "${USER_CONFIG_FILE}"
   writeConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
   # Initialize with real MAC
-  writeConfigKey "original-mac" "${MACF}" "${USER_CONFIG_FILE}"
   writeConfigKey "cmdline.netif_num" "1" "${USER_CONFIG_FILE}"
   writeConfigKey "cmdline.mac1" "${MACF}" "${USER_CONFIG_FILE}"
 fi
+writeConfigKey "original-mac" "${MACF}" "${USER_CONFIG_FILE}"
 
 # Set custom MAC if defined
 MAC1=`readConfigKey "cmdline.mac1" "${USER_CONFIG_FILE}"`

files/board/arpl/overlayfs/opt/arpl/menu.sh

@@ -367,7 +367,7 @@ function cmdlineMenu() {
           dialog --backtitle "`backtitle`" --title "User cmdline" \
             --inputbox "Type a custom MAC address" 0 0 "${CMDLINE['mac1']}"\
             2>${TMP_PATH}/resp
-          [ $? -ne 0 ] && continue
+          [ $? -ne 0 ] && break
           MAC="`<"${TMP_PATH}/resp"`"
           [ -z "${MAC}" ] && MAC="`readConfigKey "original-mac" "${USER_CONFIG_FILE}"`"
           MAC1="`echo "${MAC}" | sed 's/://g'`"