Skip to content

W
White Rabbit Switch - Software
Commit 464b0a0f authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

rootfs: add error checking for CONFIG_VLANS_PORTXX_VID in assembly_ppsi_conf.sh 

Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent fb97f3fb
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
userspace/rootfs_override/wr/bin/assembly_ppsi_conf.sh
View file @ 464b0a0f
...@@ -46,7 +46,7 @@ for i_zero in {01..18};do ...@@ -46,7 +46,7 @@ for i_zero in {01..18};do
"rx"|"tx"|"fiber") "rx"|"tx"|"fiber")
continue;; continue;;
*) *)
echo "Invalid parameter $param in CONFIG_PORT"$i_zero"_PARAMS" ;; echo "$0: Invalid parameter $param in CONFIG_PORT"$i_zero"_PARAMS" ;;
esac esac
done done
...@@ -90,8 +90,17 @@ for i_zero in {01..18};do ...@@ -90,8 +90,17 @@ for i_zero in {01..18};do
# check port mode # check port mode
if [ "$port_mode_access" = "y" ]; then if [ "$port_mode_access" = "y" ]; then
ppsi_vlans=$(eval "echo \$CONFIG_VLANS_PORT"$i_zero"_VID") ppsi_vlans=$(eval "echo \$CONFIG_VLANS_PORT"$i_zero"_VID")
echo "vlan $ppsi_vlans" >> $OUTPUT_FILE # use "&> /dev/null" to avoid error when $ppsi_vlans
# is not a number
if [ "$ppsi_vlans" -ge 0 ] &> /dev/null \
&& [ "$ppsi_vlans" -le 4094 ] &> /dev/null; then
echo "vlan $ppsi_vlans" >> $OUTPUT_FILE
else
echo "$0: Wrong value \"$ppsi_vlans\" in CONFIG_VLANS_PORT"$i_zero"_VID"
continue;
fi
fi fi
if [ "$port_mode_trunk" = "y" ] \ if [ "$port_mode_trunk" = "y" ] \
|| [ "$port_mode_disabled" = "y" ] \ || [ "$port_mode_disabled" = "y" ] \
|| [ "$port_mode_unqualified" = "y" ]; then || [ "$port_mode_unqualified" = "y" ]; then
...@@ -106,4 +115,3 @@ for i_zero in {01..18};do ...@@ -106,4 +115,3 @@ for i_zero in {01..18};do
# separate ports # separate ports
echo "" >> $OUTPUT_FILE echo "" >> $OUTPUT_FILE
done done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment