diff options
| author | William A. Kennington III <wak@google.com> | 2022-06-30 02:55:07 +0300 |
|---|---|---|
| committer | William A. Kennington III <wak@google.com> | 2022-07-01 00:04:07 +0300 |
| commit | d5a68dfc750ece4c56394883b690489c60f8f815 (patch) | |
| tree | b100089508b8595754de994efebddcecabace89d /meta-google | |
| parent | 4a32a92a03fa82875b924419a5eefde2f834ff96 (diff) | |
| download | openbmc-d5a68dfc750ece4c56394883b690489c60f8f815.tar.xz | |
gbmc-ncsi-config: Directly read service file
This makes the override idempotent and correct. Otherwise, running the
script multiple times would produce broken unit files.
Change-Id: I351c0becc5555020ce9531cae164fa56f502cfdc
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-smartnic-wa.sh.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-smartnic-wa.sh.in b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-smartnic-wa.sh.in index 22cbce3d59..533888cbb4 100644 --- a/meta-google/recipes-google/ncsi/files/gbmc-ncsi-smartnic-wa.sh.in +++ b/meta-google/recipes-google/ncsi/files/gbmc-ncsi-smartnic-wa.sh.in @@ -20,7 +20,8 @@ echo 'ExecStart=' >>"$override" # Remove the source relay port from the relay, bringing it back to run on # the default port 547. Our relays don't support the source port option needed # to run on 3967 for our legacy NICs. -systemctl cat gbmc-ncsi-dhcrelay | grep '^ExecStart=' | sed 's, -rp 3967,,' >>"$override" +grep '^ExecStart=' /lib/systemd/system/gbmc-ncsi-dhcrelay.service | \ + sed 's, -rp 3967,,' >>"$override" override=/run/systemd/system/gbmc-br-dhcp.service.d/10-direct.conf mkdir -p "$(dirname "$override")" @@ -28,7 +29,8 @@ echo '[Service]' >"$override" echo 'ExecStart=' >>"$override" # Switch the gbmcbr interface for the NCSI one to avoid passing the SOLICIT # message through the BMC relay. -systemctl cat gbmc-br-dhcp | grep '^ExecStart=' | sed 's, -i gbmcbr, -i @NCSI_IF@,' >>"$override" +grep '^ExecStart=' /lib/systemd/system/gbmc-br-dhcp.service | \ + sed 's, -i gbmcbr, -i @NCSI_IF@,' >>"$override" systemctl daemon-reload systemctl reset-failed gbmc-ncsi-dhcrelay |