From d5b0834818c7c3c31c93e9b07f2705e9e1005595 Mon Sep 17 00:00:00 2001
From: Elise Haldane <107867060+elisehaldane@users.noreply.github.com>
Date: Tue, 20 Feb 2024 14:25:32 +0000
Subject: [PATCH] Change the hybrid ABI path to local64 (#2)

---
 etc/rc.d/pot       | 38 +++++++++++++++++++-------------------
 etc/rc.d/pot_early | 14 +++++++-------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/etc/rc.d/pot b/etc/rc.d/pot
index e5579352..1e418b0a 100755
--- a/etc/rc.d/pot
+++ b/etc/rc.d/pot
@@ -7,7 +7,7 @@
 
 . /etc/rc.subr
 
-PATH=$PATH:/usr/local/bin
+PATH=$PATH:/usr/local64/bin
 name="pot"
 desc="Pot containers"
 procname="pot"
@@ -16,8 +16,8 @@ start_cmd="pot_start"
 stop_cmd="pot_stop"
 restart_cmd="pot_restart"
 status_cmd="pot_status"
-start_precmd="pot_deprecated_start"
-stop_postcmd="pot_deprecated_stop"
+# start_precmd="pot_deprecated_start"
+# stop_postcmd="pot_deprecated_stop"
 
 load_rc_config $name
 : ${pot_enable:=NO}
@@ -25,10 +25,10 @@ load_rc_config $name
 pot_start()
 {
 	local _pname _dyn_pot_list _start
-	_dyn_pot_list=$(/usr/local/bin/pot ls -q)
+	_dyn_pot_list=$(/usr/local64/bin/pot ls -q)
 	for _pname in $_dyn_pot_list ; do
-		if [ "$( /usr/local/bin/pot get-attr -p "$_pname" -A start-at-boot -q )" = "YES" ]; then
-			/usr/local/bin/pot start "$_pname"
+		if [ "$( /usr/local64/bin/pot get-attr -p "$_pname" -A start-at-boot -q )" = "YES" ]; then
+			/usr/local64/bin/pot start "$_pname"
 		fi
 	done
 }
@@ -36,10 +36,10 @@ pot_start()
 pot_stop()
 {
 	local _pname _dyn_pot_list _start
-	_dyn_pot_list=$(/usr/local/bin/pot ls -q)
+	_dyn_pot_list=$(/usr/local64/bin/pot ls -q)
 	for _pname in $_dyn_pot_list ; do
-		if [ "$( /usr/local/bin/pot get-attr -p "$_pname" -A start-at-boot -q )" = "YES" ]; then
-			/usr/local/bin/pot stop "$_pname"
+		if [ "$( /usr/local64/bin/pot get-attr -p "$_pname" -A start-at-boot -q )" = "YES" ]; then
+			/usr/local64/bin/pot stop "$_pname"
 		fi
 	done
 }
@@ -47,10 +47,10 @@ pot_stop()
 pot_early_start()
 {
 	local _pname _dyn_pot_list _start
-	_dyn_pot_list=$(/usr/local/bin/pot ls -q)
+	_dyn_pot_list=$(/usr/local64/bin/pot ls -q)
 	for _pname in $_dyn_pot_list ; do
-		if [ "$( /usr/local/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ]; then
-			/usr/local/bin/pot start "$_pname"
+		if [ "$( /usr/local64/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ]; then
+			/usr/local64/bin/pot start "$_pname"
 		fi
 	done
 }
@@ -58,10 +58,10 @@ pot_early_start()
 pot_early_stop()
 {
 	local _pname _dyn_pot_list _start
-	_dyn_pot_list=$(/usr/local/bin/pot ls -q)
+	_dyn_pot_list=$(/usr/local64/bin/pot ls -q)
 	for _pname in $_dyn_pot_list ; do
-		if [ "$( /usr/local/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ]; then
-			/usr/local/bin/pot stop "$_pname"
+		if [ "$( /usr/local64/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ]; then
+			/usr/local64/bin/pot stop "$_pname"
 		fi
 	done
 }
@@ -78,11 +78,11 @@ pot_restart()
 pot_status()
 {
 	local _pname _dyn_pot_list
-	_dyn_pot_list=$(/usr/local/bin/pot ls -q)
+	_dyn_pot_list=$(/usr/local64/bin/pot ls -q)
 	for _pname in $_dyn_pot_list ; do
-		if [ "$( /usr/local/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ] ||
-		   [ "$( /usr/local/bin/pot get-attr -p "$_pname" -A start-at-boot -q )" = "YES" ]; then
-			if /usr/local/bin/pot info -qrp "$_pname" ; then
+		if [ "$( /usr/local64/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ] ||
+		   [ "$( /usr/local64/bin/pot get-attr -p "$_pname" -A start-at-boot -q )" = "YES" ]; then
+			if /usr/local64/bin/pot info -qrp "$_pname" ; then
 				echo "pot $_pname is up and running"
 			else
 				echo "pot $_pname is not running"
diff --git a/etc/rc.d/pot_early b/etc/rc.d/pot_early
index be9cc6dd..368069aa 100755
--- a/etc/rc.d/pot_early
+++ b/etc/rc.d/pot_early
@@ -7,7 +7,7 @@
 
 . /etc/rc.subr
 
-PATH=$PATH:/usr/local/bin
+PATH=$PATH:/usr/local64/bin
 name="pot_early"
 desc="Pot containers - early start"
 procname="pot"
@@ -21,10 +21,10 @@ load_rc_config $name
 pot_early_start()
 {
 	local _pname _dyn_pot_list _start
-	_dyn_pot_list=$(/usr/local/bin/pot ls -q)
+	_dyn_pot_list=$(/usr/local64/bin/pot ls -q)
 	for _pname in $_dyn_pot_list ; do
-		if [ "$( /usr/local/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ]; then
-			/usr/local/bin/pot start "$_pname"
+		if [ "$( /usr/local64/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ]; then
+			/usr/local64/bin/pot start "$_pname"
 		fi
 	done
 }
@@ -32,10 +32,10 @@ pot_early_start()
 pot_early_stop()
 {
 	local _pname _dyn_pot_list _start
-	_dyn_pot_list=$(/usr/local/bin/pot ls -q)
+	_dyn_pot_list=$(/usr/local64/bin/pot ls -q)
 	for _pname in $_dyn_pot_list ; do
-		if [ "$( /usr/local/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ]; then
-			/usr/local/bin/pot stop "$_pname"
+		if [ "$( /usr/local64/bin/pot get-attr -p "$_pname" -A early-start-at-boot -q )" = "YES" ]; then
+			/usr/local64/bin/pot stop "$_pname"
 		fi
 	done
 }