From 39345662de4313a72f5f55e41aec0c3d1027b952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mina=20Gali=C4=87?= <me+git@igalic.co>
Date: Wed, 23 Nov 2022 14:50:01 +0000
Subject: [PATCH] FreeBSD init: use cloudinit_enable as only rcvar

all components of cloudinit need to run, and in a specific order.
If cloudinit is to be enabled, it should only rely on one variable.
This change better encodes that, than #161

Sponsored by: FreeBSD Foundation
---
 sysvinit/freebsd/cloudconfig    | 4 ++--
 sysvinit/freebsd/cloudfinal     | 4 ++--
 sysvinit/freebsd/cloudinit      | 2 +-
 sysvinit/freebsd/cloudinitlocal | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sysvinit/freebsd/cloudconfig b/sysvinit/freebsd/cloudconfig
index fb604f4d2e1..13c47280316 100755
--- a/sysvinit/freebsd/cloudconfig
+++ b/sysvinit/freebsd/cloudconfig
@@ -21,8 +21,8 @@ cloudconfig_start()
 	${command} modules --mode config
 }
 
-load_rc_config $name
+load_rc_config 'cloudinit'
 
-: ${cloudconfig_enable="NO"}
+: ${cloudinit_enable="NO"}
 
 run_rc_command "$1"
diff --git a/sysvinit/freebsd/cloudfinal b/sysvinit/freebsd/cloudfinal
index 72047653cfd..76a584ec064 100755
--- a/sysvinit/freebsd/cloudfinal
+++ b/sysvinit/freebsd/cloudfinal
@@ -21,8 +21,8 @@ cloudfinal_start()
 	${command} modules --mode final
 }
 
-load_rc_config $name
+load_rc_config 'cloudinit'
 
-: ${cloudfinal_enable="NO"}
+: ${cloudinit_enable="NO"}
 
 run_rc_command "$1"
diff --git a/sysvinit/freebsd/cloudinit b/sysvinit/freebsd/cloudinit
index d26f3d0fbd3..679adf5daf3 100755
--- a/sysvinit/freebsd/cloudinit
+++ b/sysvinit/freebsd/cloudinit
@@ -21,7 +21,7 @@ cloudinit_start()
 	${command} init
 }
 
-load_rc_config $name
+load_rc_config 'cloudinit'
 
 : ${cloudinit_enable="NO"}
 
diff --git a/sysvinit/freebsd/cloudinitlocal b/sysvinit/freebsd/cloudinitlocal
index cb67b4a2246..d6c3579e2b9 100755
--- a/sysvinit/freebsd/cloudinitlocal
+++ b/sysvinit/freebsd/cloudinitlocal
@@ -21,8 +21,8 @@ cloudlocal_start()
 	${command} init --local
 }
 
-load_rc_config $name
+load_rc_config 'cloudinit'
 
-: ${cloudinitlocal_enable="NO"}
+: ${cloudinit_enable="NO"}
 
 run_rc_command "$1"