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

1 files changed, 11 insertions, 12 deletions

diff --git a/cloudinit/config/cc_resizefs.py b/cloudinit/config/cc_resizefs.py
index 076b9d5a..01dfc125 100644
--- a/cloudinit/config/cc_resizefs.py
+++ b/cloudinit/config/cc_resizefs.py
@@ -8,7 +8,6 @@
 
 """Resizefs: cloud-config module which resizes the filesystem"""
 
-
 import errno
 import getopt
 import os
@@ -81,7 +80,7 @@ def _resize_xfs(mount_point, devpth):
 
 
 def _resize_ufs(mount_point, devpth):
-    return ('growfs', '-y', devpth)
+    return ('growfs', '-y', mount_point)
 
 
 def _resize_zfs(mount_point, devpth):
@@ -101,7 +100,7 @@ def _can_skip_resize_ufs(mount_point, devpth):
     """
     # dumpfs -m /
     # newfs command for / (/dev/label/rootfs)
-      newfs -O 2 -U -a 4 -b 32768 -d 32768 -e 4096 -f 4096 -g 16384
+      newfs -L rootf -O 2 -U -a 4 -b 32768 -d 32768 -e 4096 -f 4096 -g 16384
             -h 64 -i 8192 -j -k 6408 -m 8 -o time -s 58719232 /dev/label/rootf
     """
     cur_fs_sz = None
@@ -110,7 +109,7 @@ def _can_skip_resize_ufs(mount_point, devpth):
     for line in dumpfs_res.splitlines():
         if not line.startswith('#'):
             newfs_cmd = shlex.split(line)
-            opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:m:o:'
+            opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:m:o:L:'
             optlist, _args = getopt.getopt(newfs_cmd[1:], opt_value)
             for o, a in optlist:
                 if o == "-s":
@@ -183,7 +182,7 @@ def maybe_get_writable_device_path(devpath, info, log):
             not container):
         devpath = util.rootdev_from_cmdline(util.get_cmdline())
         if devpath is None:
-            log.warn("Unable to find device '/dev/root'")
+            log.warning("Unable to find device '/dev/root'")
             return None
         log.debug("Converted /dev/root to '%s' per kernel cmdline", devpath)
 
@@ -212,8 +211,8 @@ def maybe_get_writable_device_path(devpath, info, log):
             log.debug("Device '%s' did not exist in container. "
                       "cannot resize: %s", devpath, info)
         elif exc.errno == errno.ENOENT:
-            log.warn("Device '%s' did not exist. cannot resize: %s",
-                     devpath, info)
+            log.warning("Device '%s' did not exist. cannot resize: %s",
+                        devpath, info)
         else:
             raise exc
         return None
@@ -223,8 +222,8 @@ def maybe_get_writable_device_path(devpath, info, log):
             log.debug("device '%s' not a block device in container."
                       " cannot resize: %s" % (devpath, info))
         else:
-            log.warn("device '%s' not a block device. cannot resize: %s" %
-                     (devpath, info))
+            log.warning("device '%s' not a block device. cannot resize: %s" %
+                        (devpath, info))
         return None
     return devpath  # The writable block devpath
 
@@ -243,7 +242,7 @@ def handle(name, cfg, _cloud, log, args):
     resize_what = "/"
     result = util.get_mount_info(resize_what, log)
     if not result:
-        log.warn("Could not determine filesystem type of %s", resize_what)
+        log.warning("Could not determine filesystem type of %s", resize_what)
         return
 
     (devpth, fs_type, mount_point) = result
@@ -280,8 +279,8 @@ def handle(name, cfg, _cloud, log, args):
             break
 
     if not resizer:
-        log.warn("Not resizing unknown filesystem type %s for %s",
-                 fs_type, resize_what)
+        log.warning("Not resizing unknown filesystem type %s for %s",
+                    fs_type, resize_what)
         return
 
     resize_cmd = resizer(resize_what, devpth)