daemon.json for kata agent forwarder moved to apf.json

[gcoon151]

Making a note just so I don't forget. When I build an image now with this it makes agent forwarder config daemon.json but upstream they moved that to apf.json.

I'll try to find where that is in this podvm dmverity builder but it's not jumping out at me.

[gcoon151]

So I decided to symlink it since I wanted the image to work with older init data that expects it in one place and newer that expects it in another. This fixed it:

diff --git a/scripts/coco/podvm/podvm_maker.sh b/scripts/coco/podvm/podvm_maker.sh
index 2f17450..781be88 100755
--- a/scripts/coco/podvm/podvm_maker.sh
+++ b/scripts/coco/podvm/podvm_maker.sh
@@ -17,6 +17,17 @@ tar -xzvf /tmp/pause-bundle.tar.gz -C /
 # TODO: move to payload ?
 tar -xzvf /tmp/luks-config.tar.gz -C /
 
+# link daemon.json to apf.json so that it works on both old and new agent-forwarder config location
+# Ensure canonical config is on the sealed root
+install -D -m 0644 /tmp/apf.json /etc/peerpod/apf.json
+
+# Create a tmpfiles rule so /run/peerpod/daemon.json points to it on every boot
+cat >/etc/tmpfiles.d/agent-protocol-forwarder.conf <<'EOF'
+d /run/peerpod 0755 root root -
+L /run/peerpod/daemon.json - - - - /var/run/peerpod/apf.json
+EOF
+
+

Will offer to PR shortly.

Source of this issue
confidential-containers/cloud-api-adaptor#2494

[gcoon151]

#76