Change the hybrid ABI path to local64 (#2)

digicatapult · Feb 20, 2024 · d5b0834 · d5b0834
1 parent 25f4a6c
commit d5b0834
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git 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,52 +16,52 @@ 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}
 
 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
 }
 
 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
 }
 
 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
 }
 
 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
@@ -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,21 +21,21 @@ 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
 }
 
 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
 }