From 4f177d3363a0efb2ee67b8a46efaca7707c2437f Mon Sep 17 00:00:00 2001 From: Eduardo Otubo Date: Mon, 24 Aug 2020 15:25:36 +0200 Subject: [PATCH 2/3] swap file "size" being used before checked if str (#315) RH-Author: Eduardo Otubo Message-id: <20200820092042.5418-3-otubo@redhat.com> Patchwork-id: 98192 O-Subject: [RHEL-8.3.0 cloud-init PATCH 2/3] swap file "size" being used before checked if str (#315) Bugzilla: 1794664 RH-Acked-by: Miroslav Rezanina RH-Acked-by: Mohammed Gamal commit 46cf23c28812d3e3ba0c570defd9a05628af5556 Author: Eduardo Otubo Date: Tue Apr 14 17:45:14 2020 +0200 swap file "size" being used before checked if str Swap file size variable was being used before checked if it's set to str "auto". If set to "auto", it will break with: failed to setup swap: unsupported operand type(s) for /: 'str' and 'int' Signed-off-by: Eduardo Otubo Signed-off-by: Eduardo Otubo Signed-off-by: Miroslav Rezanina --- cloudinit/config/cc_mounts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py index 4293844..0573026 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -274,7 +274,6 @@ def setup_swapfile(fname, size=None, maxsize=None): maxsize: the maximum size """ swap_dir = os.path.dirname(fname) - mibsize = str(int(size / (2 ** 20))) if str(size).lower() == "auto": try: memsize = util.read_meminfo()['total'] @@ -286,6 +285,7 @@ def setup_swapfile(fname, size=None, maxsize=None): size = suggested_swapsize(fsys=swap_dir, maxsize=maxsize, memsize=memsize) + mibsize = str(int(size / (2 ** 20))) if not size: LOG.debug("Not creating swap: suggested size was 0") return -- 1.8.3.1