sailesh1993 / rpms / cloud-init

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