Cloud-init: T2117: Updated to 20.1

  - Merge 20.1 version from the Canonical repository
  - Removed unneeded changes in datasources (now only OVF datasource is not equal to upstream's version)
  - Adapted cc_vyos module to new Cloud-init version
  - Changed Jenkinsfile to use build scripts, provided by upstream

4 files changed, 13 insertions, 1 deletions

diff --git a/sysvinit/freebsd/cloudconfig b/sysvinit/freebsd/cloudconfig
index e4064fa3..fb604f4d 100755
--- a/sysvinit/freebsd/cloudconfig
+++ b/sysvinit/freebsd/cloudconfig
@@ -22,4 +22,7 @@ cloudconfig_start()
 }
 
 load_rc_config $name
+
+: ${cloudconfig_enable="NO"}
+
 run_rc_command "$1"
diff --git a/sysvinit/freebsd/cloudfinal b/sysvinit/freebsd/cloudfinal
index b6894c39..72047653 100755
--- a/sysvinit/freebsd/cloudfinal
+++ b/sysvinit/freebsd/cloudfinal
@@ -22,4 +22,7 @@ cloudfinal_start()
 }
 
 load_rc_config $name
+
+: ${cloudfinal_enable="NO"}
+
 run_rc_command "$1"
diff --git a/sysvinit/freebsd/cloudinit b/sysvinit/freebsd/cloudinit
index 33263009..aa5bd118 100755
--- a/sysvinit/freebsd/cloudinit
+++ b/sysvinit/freebsd/cloudinit
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # PROVIDE: cloudinit
-# REQUIRE: FILESYSTEMS NETWORKING cloudinitlocal
+# REQUIRE: FILESYSTEMS NETWORKING cloudinitlocal ldconfig devd
 # BEFORE:  cloudconfig cloudfinal
 
 . /etc/rc.subr
@@ -22,4 +22,7 @@ cloudinit_start()
 }
 
 load_rc_config $name
+
+: ${cloudinit_enable="NO"}
+
 run_rc_command "$1"
diff --git a/sysvinit/freebsd/cloudinitlocal b/sysvinit/freebsd/cloudinitlocal
index 7a034b3b..cb67b4a2 100755
--- a/sysvinit/freebsd/cloudinitlocal
+++ b/sysvinit/freebsd/cloudinitlocal
@@ -22,4 +22,7 @@ cloudlocal_start()
 }
 
 load_rc_config $name
+
+: ${cloudinitlocal_enable="NO"}
+
 run_rc_command "$1"