diff options
| author | William A. Kennington III <wak@google.com> | 2021-11-05 06:52:17 +0300 |
|---|---|---|
| committer | William A. Kennington III <wak@google.com> | 2021-11-06 02:40:19 +0300 |
| commit | cbd9ef029b2134af941a801715cf3b7281d21e95 (patch) | |
| tree | 1f6e534c5525d6da723489578063952861e913c3 /meta-google | |
| parent | 031785343fcf91f53857678970db1f3ba4437ce0 (diff) | |
| download | openbmc-cbd9ef029b2134af941a801715cf3b7281d21e95.tar.xz | |
meta-google: gbmc-ncsi-config: Ignore deprecated addresses
We plan to use deprecated addresses to allow for neighbor discovery, but
they will be ignored by networkd and this script as to prevent
misconfiguration.
Change-Id: Ibc0bee71c19add79f05b5ce58b34d3175e2f6fbd
Signed-off-by: William A. Kennington III <wak@google.com>
Diffstat (limited to 'meta-google')
| -rw-r--r-- | meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-pub-addr.sh.in | 3 | ||||
| -rw-r--r-- | meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-pub-addr.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-pub-addr.sh.in index 78af419c5..ce53b8efb 100644 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-pub-addr.sh.in +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-br-pub-addr.sh.in @@ -87,7 +87,8 @@ gbmc_ncsi_br_pub_addr_hook() { gbmc_ncsi_br_pub_addr_init=1 gbmc_ncsi_br_pub_addr_update elif [ "$change" = 'addr' -a "$intf" = '@NCSI_IF@' ] && - [ "$scope" = 'global' -a "$fam" = 'inet6' ]; then + [ "$scope" = 'global' -a "$fam" = 'inet6' ] && + [[ "$flags" != *deprecated* ]]; then if [ "$action" = 'add' -a "$ip" != "$gbmc_ncsi_br_pub_addr_lastip" ]; then gbmc_ncsi_br_pub_addr_lastip="$ip" gbmc_ncsi_br_pub_addr_update diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in index fc8e8198a..7a630f5fe 100644 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-nft.sh.in @@ -80,7 +80,8 @@ gbmc_ncsi_nft_hook() { if [ "$change" = 'init' ]; then gbmc_ncsi_nft_init=1 gbmc_ncsi_nft_update - elif [ "$change" = 'addr' -a "$intf" = '@NCSI_IF@' -a "$scope" = 'global' ]; then + elif [ "$change" = 'addr' -a "$intf" = '@NCSI_IF@' -a "$scope" = 'global' ] && + [[ "$flags" != *deprecated* ]]; then if [ "$fam" = 'inet6' ]; then local -n lastip='gbmc_ncsi_nft_lastip6' else |