From f01e94e22c07a54d3d4f26dca28e89b65cb3678f Mon Sep 17 00:00:00 2001
From: sudhar-krishnakumar <sudhar.krishnakumar@intel.com>
Date: Wed, 11 Dec 2024 12:45:28 -0800
Subject: [PATCH] Fix for PR->292. D5 interface is used for primary networking.
 (#293)

Also needed to add a sync after files get removed, before
re-creating port-setup.sh and port-setup.log files.
---
 ipu-plugin/pkg/ipuplugin/lifecycleservice.go | 24 ++++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/ipu-plugin/pkg/ipuplugin/lifecycleservice.go b/ipu-plugin/pkg/ipuplugin/lifecycleservice.go
index 984750c9..0d1e7df8 100644
--- a/ipu-plugin/pkg/ipuplugin/lifecycleservice.go
+++ b/ipu-plugin/pkg/ipuplugin/lifecycleservice.go
@@ -683,16 +683,20 @@ func countAPFDevices() int {
 
 func postInitAppScript() string {
 
-	postInitAppScriptStr := `PORT0_SETUP_SCRIPT=/work/scripts/port0-setup.sh
-PORT0_SETUP_LOG=/work/port0-setup.log
+	postInitAppScriptStr := `PORT_SETUP_SCRIPT=/work/scripts/port-setup.sh
+PORT_SETUP_LOG=/work/port-setup.log
 
-pkill -9 $(basename ${PORT0_SETUP_SCRIPT})
-/bin/rm -f ${PORT0_SETUP_SCRIPT} ${PORT0_SETUP_LOG}
+pkill -9 $(basename ${PORT_SETUP_SCRIPT})
+/bin/rm -f ${PORT_SETUP_SCRIPT} ${PORT_SETUP_LOG}
 
-cat<<PORT0_CONFIG_EOF > ${PORT0_SETUP_SCRIPT}
+#To ensure files get removed.
+sync
+
+cat<<PORT_CONFIG_EOF > ${PORT_SETUP_SCRIPT}
 #!/bin/bash
-IDPF_VPORT_NAME="enp0s1f0d4"
-ACC_VPORT_ID=0x4
+set -x
+IDPF_VPORT_NAME="enp0s1f0d5"
+ACC_VPORT_ID=0x5
 retry=0
 
 while true ; do
@@ -720,10 +724,10 @@ else
 	echo "RETRY: \${retry} : #Add to VSI Group 1 :  \${IDPF_VPORT_NAME} .. "
 fi
 done
-PORT0_CONFIG_EOF
+PORT_CONFIG_EOF
 
-/usr/bin/chmod a+x ${PORT0_SETUP_SCRIPT}
-/usr/bin/nohup ${PORT0_SETUP_SCRIPT}  0>&- &> ${PORT0_SETUP_LOG} &`
+/usr/bin/chmod a+x ${PORT_SETUP_SCRIPT}
+/usr/bin/nohup ${PORT_SETUP_SCRIPT}  0>&- &> ${PORT_SETUP_LOG} &`
 
 	return postInitAppScriptStr
 }