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.
canonical · Nov 23, 2022 · 822b8a0 · 822b8a0
1 parent 65eb520
commit 822b8a0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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 $rcvar
 
-: ${cloudconfig_enable="NO"}
+: ${cloudinit_enable="NO"}
 
 run_rc_command "$1"
diff --git 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 $rcvar
 
-: ${cloudfinal_enable="NO"}
+: ${cloudinit_enable="NO"}
 
 run_rc_command "$1"
diff --git a/sysvinit/freebsd/cloudinit b/sysvinit/freebsd/cloudinit
@@ -21,7 +21,7 @@ cloudinit_start()
 	${command} init
 }
 
-load_rc_config $name
+load_rc_config $rcvar
 
 : ${cloudinit_enable="NO"}
 

diff --git a/sysvinit/freebsd/cloudinitlocal b/sysvinit/freebsd/cloudinitlocal
@@ -21,8 +21,8 @@ cloudlocal_start()
 	${command} init --local
 }
 
-load_rc_config $name
+load_rc_config $rcvar
 
-: ${cloudinitlocal_enable="NO"}
+: ${cloudinit_enable="NO"}
 
 run_rc_command "$1"