summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam A. Kennington III <wak@google.com>2021-11-23 23:00:36 +0300
committerWilliam A. Kennington III <wak@google.com>2021-12-06 22:45:41 +0300
commite2e667473e93a48bee69722dea603418d0c60591 (patch)
treecd769630e50726403c114feb7f37aa3e85d768c3
parentb49ee37efc853e04194aeadc5ebf65d30576d344 (diff)
downloadopenbmc-e2e667473e93a48bee69722dea603418d0c60591.tar.xz
meta-google: gbmc-ncsi-config: Rename address clear rules
This ensures they are run prior to running other DHCP configuration logic. Change-Id: I0180414bbc291ea49e548a312cd2b713344613e1 Signed-off-by: William A. Kennington III <wak@google.com>
-rw-r--r--meta-google/recipes-google/ncsi/files/25-gbmc-ncsi-clear-ip.sh.in (renamed from meta-google/recipes-google/ncsi/files/gbmc-ncsi-clear-ip.sh.in)0
-rw-r--r--meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb8
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-clear-ip.sh.in b/meta-google/recipes-google/ncsi/files/25-gbmc-ncsi-clear-ip.sh.in
index e17a5e2009..e17a5e2009 100644
--- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-clear-ip.sh.in
+++ b/meta-google/recipes-google/ncsi/files/25-gbmc-ncsi-clear-ip.sh.in
diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb
index 6e25824951..0312f05023 100644
--- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb
+++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb
@@ -20,7 +20,7 @@ SRC_URI += " \
file://gbmc-ncsi-br-pub-addr.sh.in \
file://gbmc-ncsi-br-deprecated-ips.sh.in \
file://gbmc-ncsi-set-nicenabled.service.in \
- file://gbmc-ncsi-clear-ip.sh.in \
+ file://25-gbmc-ncsi-clear-ip.sh.in \
"
S = "${WORKDIR}"
@@ -109,9 +109,9 @@ do_install:append() {
dhcpdir=${D}${datadir}/gbmc-br-dhcp/
install -d -m0755 $dhcpdir
- sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-clear-ip.sh.in \
- >${WORKDIR}/gbmc-ncsi-clear-ip.sh
- install -m644 ${WORKDIR}/gbmc-ncsi-clear-ip.sh $dhcpdir
+ sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/25-gbmc-ncsi-clear-ip.sh.in \
+ >${WORKDIR}/25-gbmc-ncsi-clear-ip.sh
+ install -m644 ${WORKDIR}/25-gbmc-ncsi-clear-ip.sh $dhcpdir
sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-set-nicenabled.service.in \
>${D}${systemd_system_unitdir}/gbmc-ncsi-set-nicenabled.service