Skip to content

Commit 7ab9f12

Browse files
committed
fixup
1 parent 4dfa893 commit 7ab9f12

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

board/common/selected-boards.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ is_board_enabled() {
2727
fi
2828
}
2929

30-
# Function to get the actual config symbol from Config.in file
3130
get_actual_config_symbol() {
3231
local board_name=$1
3332
local config_file="${BOARD_PACKAGE_DIR}/$board_name/Config.in"
@@ -52,7 +51,6 @@ for board_path in "$BOARD_SRC_DIR"/*; do
5251
if [ -d "$board_path" ]; then
5352
board_name=$(basename "$board_path")
5453
config_symbol=$(get_actual_config_symbol "$board_name")
55-
((total_count++))
5654

5755
if is_board_enabled "$config_symbol"; then
5856
boards="$boards $board_name"

src/confd/bin/bootstrap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ else
166166
cp "$FAILURE_CFG" "$INIT_DATA"
167167
fi
168168
rc=$?
169-
cat $INIT_DATA > /dev/console
170169
# Ensure 'admin' group users always have access
171170
chgrp wheel "$CFG_PATH_"
172171
chmod g+w "$CFG_PATH_"

src/confd/bin/gen-interfaces

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ filter_iface_ports()
9797
for phy in $ifaces; do
9898
found=""
9999
for port in $ports; do
100-
[ -d "/sys/class/net/${port}/wireless" ] && continue
100+
[ -d "/sys/class/net/${port}/wireless" ] && continue
101101
if [ "$port" = "$phy" ]; then
102102
found=true
103103
break
@@ -148,7 +148,6 @@ ports=$(ip -d -j link show group port | jq -r '
148148

149149
# Remaining external interfaces not classified as switch ports
150150
ifaces="$(filter_iface_ports "$phys_ifaces" "$ports")"
151-
compatible=$(cat '/run/system.json' | jq -r '.compatible | join(" ")')
152151
cat <<EOF
153152
{
154153
"ietf-interfaces:interfaces": {
@@ -194,7 +193,7 @@ cat <<EOF
194193
}
195194
$(for iface in $ifaces; do gen_iface_json "$iface"; done)
196195
$(for iface in $ports; do gen_iface_json "$iface" "$bridge"; done)
197-
]
196+
]
198197
EOF
199198
if [ "$dhcp" = "true" ] && [ -n "$bridge" ]; then
200199
cat <<EOF

0 commit comments

Comments
 (0)