meta-google: gbmc-bridge: Rework IP address persistence
This consolidates all of the mechanisms which write out a persistent IP
into a single place. It also transitions to writing a very simple
persistent file instead of systemd style network units.
Change-Id: Ib99d7646178d2c5383cf23b09248bf24544c1d9e
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb
index b761b16..364afee 100644
--- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb
+++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb
@@ -21,7 +21,7 @@
file://gbmc-ncsi-br-pub-addr.sh.in \
file://gbmc-ncsi-br-deprecated-ips.sh.in \
file://gbmc-ncsi-set-nicenabled.service.in \
- file://25-gbmc-ncsi-clear-ip.sh.in \
+ file://50-gbmc-ncsi-clear-ip.sh.in \
"
S = "${WORKDIR}"
@@ -38,7 +38,7 @@
"
FILES:${PN} += " \
- ${datadir}/gbmc-br-dhcp \
+ ${datadir}/gbmc-br-lib \
${datadir}/gbmc-ip-monitor \
${systemd_unitdir} \
"
@@ -108,11 +108,11 @@
>${WORKDIR}/gbmc-ncsi-br-deprecated-ips.sh
install -m644 ${WORKDIR}/gbmc-ncsi-br-deprecated-ips.sh $mondir
- dhcpdir=${D}${datadir}/gbmc-br-dhcp/
- install -d -m0755 $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
+ brlibdir=${D}${datadir}/gbmc-br-lib/
+ install -d -m0755 $brlibdir
+ sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/50-gbmc-ncsi-clear-ip.sh.in \
+ >${WORKDIR}/50-gbmc-ncsi-clear-ip.sh
+ install -m644 ${WORKDIR}/50-gbmc-ncsi-clear-ip.sh $brlibdir
sed "s,@NCSI_IF@,$if_name,g" ${WORKDIR}/gbmc-ncsi-set-nicenabled.service.in \
>${D}${systemd_system_unitdir}/gbmc-ncsi-set-nicenabled.service