modify syncd init script for supporting yml #1411
Conversation
| if [ ! -z "$line" ];then | ||
| if [ "${line::1}" == '#' ];then | ||
| echo $line >> $to_file | ||
| elif [ "$line" == "[Overwrite Section]" ];then |
There was a problem hiding this comment.
If there is an extra space at end, no match will happen, right? How to consider this scenario?
There was a problem hiding this comment.
Yes, the script will skip empty lines
| echo "Merge properties with override $override" | ||
| else | ||
| sedline=${line%=*} | ||
| if grep -q $sedline $to_file ;then |
There was a problem hiding this comment.
@geans-pin If there is "a=1" in overwrite section and "aa=1" in to_file, the sedline is a, but grep -q $sedline $to_file, still return true for this case, right? Will aa=1 be overwritten by a=1?
There was a problem hiding this comment.
In the config property, we grep for the property name. It's unlikely to have the a and aa case.
The property name will be coming along with a meaningful naming prefix.
| if [ ! -z "$PLT_CONFIG_YML" ] && [ -f $PLATFORM_DIR/common_config_support ]; then | ||
| cp -f $HWSKU_DIR/*.config.yml /tmp | ||
| cp -f /etc/sai.d/sai.profile /tmp | ||
| CONFIG_YML=$(find /tmp -name '*.yml') |
There was a problem hiding this comment.
@geans-pin what about this config.bcm file? It doesn't have .yml suffix, but it is yaml format, how to deal with it? https://github.com/sonic-net/sonic-buildimage/blob/b73d613bf581076192dd0150cb35d6d2de6645b1/device/arista/x86_64-arista_7060dx5_64s/Arista-7060DX5-64S/th4-a7060dx5-64s.config.bcm#L4
There was a problem hiding this comment.
We use the file name .yml suffix to identify the file format. Can you change the sai.profile and *.config.bcm to *.yml as following BRCM SDK rule ?
| if [ ! -z "$line" ];then | ||
| if [ "${line::1}" == '#' ];then | ||
| echo " $line" >> $to_file | ||
| elif [ "$line" == "[Overwrite Section]"];then |
There was a problem hiding this comment.
@geans-pin Overwrite section should be after [Normal Section], if we move overwrite section before [Normal Section], the logic here will not work and will overwrite all properties, is it right? Do we have a comment to remind this?
There was a problem hiding this comment.
Yes, good catch. Let's have a comment in the script and HLD
|
what is motivation here? please provide extended descrption for this pr |
No description provided.