mounts: fix mount opts string for ephemeral disk

Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
canonical · Feb 7, 2022 · 5cc8149 · 5cc8149
1 parent 826783d
commit 5cc8149
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py
@@ -393,7 +393,7 @@ def handle(_name, cfg, cloud, log, _args):
     uses_systemd = cloud.distro.uses_systemd()
     if uses_systemd:
         def_mnt_opts = (
-            "defaults,nofail, x-systemd.requires=cloud-init.service, _netdev"
+            "defaults,nofail,x-systemd.requires=cloud-init.service,_netdev"
         )
 
     defvals = [None, None, "auto", def_mnt_opts, "0", "2"]

diff --git a/tests/integration_tests/modules/test_disk_setup.py b/tests/integration_tests/modules/test_disk_setup.py
@@ -73,6 +73,10 @@ def test_device_alias(self, create_disk, client: IntegrationInstance):
         assert sdb["children"][0]["mountpoint"] == "/mnt1"
         assert sdb["children"][1]["name"] == "sdb2"
         assert sdb["children"][1]["mountpoint"] == "/mnt2"
+        result = client.execute("mount -a")
+        assert result.return_code == 0
+        assert result.stdout.strip() == ""
+        assert result.stderr.strip() == ""
 
 
 PARTPROBE_USERDATA = """\