Use board_name instead of board_id

package/base-files/files/etc/init.d/iopsys_db

@@ -11,11 +11,8 @@ initialise_board_db() {
 	local board_db_template_dir=/etc/board-db/boards
 	local board_db_file=/etc/board-db/config/hw
 	local board_name="$(board_name)"
-	local boardid="$(get_board_id)"
 	if cp "$board_db_template_dir/$board_name" "$board_db_file"; then
 		echo "Initialised board-db from $board_db_template_dir/$board_name"
-	elif cp "$board_db_template_dir/$boardid" "$board_db_file"; then
-		echo "Initialised board-db from boardid-named file $board_db_template_dir/$boardid"
 	elif touch "$board_db_file"; then
 		echo "Initialised empty board-db file."
 		db -q set hw.board=board
@@ -38,7 +35,7 @@ populate_board_params() {
 	db -q batch <<-EOT
 		set hw.board.serial_number="$(get_serial_number)"
 		set hw.board.wpa_key="$(get_wpa_key)"
-		set hw.board.model_name="$(get_board_id)"
+		set hw.board.model_name="$(cat /tmp/sysinfo/model)"
 		set hw.board.hardware_version="$(get_hardware_version)"
 		set hw.board.basemac="$(get_base_macaddr)"
 

package/base-files/files/etc/init.d/macoffset

@@ -142,17 +142,13 @@ start_service() {
 	uci -q commit wireless
 }
 
-# get macoffset file to read, enables per-boardid customisation
+# get macoffset file to read, enables customization per board_name
 get_macoffset_file() {
 	local generic_file="/etc/macoffset"
-	local boardid="$(get_board_id)"
 	local board_name="$(board_name)"
-	local custom_file_legacy="/etc/macoffset.$boardid"
 	local custom_file="/etc/macoffset.$board_name"
 	if [ -f "$custom_file" ]; then
 		printf "%s" "$custom_file"
-	elif [ -f "$custom_file_legacy" ]; then
-		printf "%s" "$custom_file_legacy"
 	else
 		printf "%s" "$generic_file"
 	fi

package/base-files/files/lib/functions/iopsys-environment.sh

@@ -15,12 +15,6 @@ get_manufacturer_pen() {
 	:
 }
 
-get_board_id() {
-	local boardid="$(fw_printenv -n boardid)"
-	[ -n "$boardid" ] || boardid="$(board_name)"
-	echo "$boardid"
-}
-
 get_serial_number() {
 	local serial_number="$(fw_printenv -n serial_number)"
 	case $serial_number in

package/base-files/files/lib/functions/iopsys-system-layout.sh

@@ -535,14 +535,10 @@ get_system_layout_info_in_global_var()
 
     local root_device_type="$(get_root_device_type "$real_root_dev")"
     local board_name="$(board_name)"
-    local board_id="$(get_board_id)"
     local board_specific_system_layout_json="/etc/system_layout/${board_name}.json"
-    local board_specific_system_layout_json_legacy="/etc/system_layout/${board_id}.json"
     local system_layout_json="/etc/system_layout/${root_device_type}.json"
     if [ -r "$board_specific_system_layout_json" ]; then
         system_layout_json="$board_specific_system_layout_json"
-    elif [ -r "$board_specific_system_layout_json_legacy" ]; then
-        system_layout_json="$board_specific_system_layout_json_legacy"
     fi
 
     json_init