From b59870ca3d8993612452a7b90687e2ed4ad0572a Mon Sep 17 00:00:00 2001
From: andreaf74 <53090017+andreaf74@users.noreply.github.com>
Date: Tue, 7 Jan 2020 21:56:46 +0100
Subject: fixed minor bug with mkswap in cc_disk_setup.py (#143)

---
 cloudinit/config/cc_disk_setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'cloudinit/config/cc_disk_setup.py')

diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py
index 29e192e8..d8d0fcf1 100644
--- a/cloudinit/config/cc_disk_setup.py
+++ b/cloudinit/config/cc_disk_setup.py
@@ -982,7 +982,9 @@ def mkfs(fs_cfg):
 
         # File systems that support the -F flag
         if overwrite or device_type(device) == "disk":
-            fs_cmd.append(lookup_force_flag(fs_type))
+            force_flag = lookup_force_flag(fs_type)
+            if force_flag:
+                fs_cmd.append(force_flag)
 
         # Add the extends FS options
         if fs_opts:
-- 
cgit v1.2.3


From 890aca4777ab61e54b6b96d251c3022cbe0b108c Mon Sep 17 00:00:00 2001
From: Ryan Harper <ryan.harper@canonical.com>
Date: Fri, 7 Feb 2020 16:52:06 -0600
Subject: cc_disk_setup: add swap filesystem force flag (#207)

---
 cloudinit/config/cc_disk_setup.py                      |  1 +
 .../unittests/test_handler/test_handler_disk_setup.py  | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

(limited to 'cloudinit/config/cc_disk_setup.py')

diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py
index d8d0fcf1..0796cb7b 100644
--- a/cloudinit/config/cc_disk_setup.py
+++ b/cloudinit/config/cc_disk_setup.py
@@ -825,6 +825,7 @@ def lookup_force_flag(fs):
         'btrfs': '-f',
         'xfs': '-f',
         'reiserfs': '-f',
+        'swap': '-f',
     }
 
     if 'ext' in fs.lower():
diff --git a/tests/unittests/test_handler/test_handler_disk_setup.py b/tests/unittests/test_handler/test_handler_disk_setup.py
index 5afcacaf..0e51f17a 100644
--- a/tests/unittests/test_handler/test_handler_disk_setup.py
+++ b/tests/unittests/test_handler/test_handler_disk_setup.py
@@ -222,4 +222,22 @@ class TestMkfsCommandHandling(CiTestCase):
              '-L', 'without_cmd', '-F', 'are', 'added'],
             shell=False)
 
+    @mock.patch('cloudinit.config.cc_disk_setup.util.which')
+    def test_mkswap(self, m_which, subp, *args):
+        """mkfs observes extra_opts and overwrite settings when cmd is not
+        present."""
+        m_which.side_effect = iter([None, '/sbin/mkswap'])
+        cc_disk_setup.mkfs({
+            'filesystem': 'swap',
+            'device': '/dev/xdb1',
+            'label': 'swap',
+            'overwrite': True,
+        })
+
+        self.assertEqual([mock.call('mkfs.swap'), mock.call('mkswap')],
+                         m_which.call_args_list)
+        subp.assert_called_once_with(
+            ['/sbin/mkswap', '/dev/xdb1', '-L', 'swap', '-f'], shell=False)
+
+#
 # vi: ts=4 expandtab
-- 
cgit v1.2.3