fix merge conflicts

canonical · Aug 2, 2024 · cb7bb25 · cb7bb25
1 parent 7df7d83
commit cb7bb25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py
@@ -524,7 +524,7 @@ def handle(name: str, cfg: Config, cloud: Cloud, args: list) -> None:
     # fs_spec, fs_file, fs_vfstype, fs_mntops, fs-freq, fs_passno
     uses_systemd = cloud.distro.uses_systemd()
     default_mount_options = (
-        "defaults,nofail,x-systemd.after=cloud-init.service,_netdev"
+        "defaults,nofail,x-systemd.after=cloud-init-network.service,_netdev"
         if uses_systemd
         else "defaults,nobootwait"
     )

diff --git a/tests/unittests/config/test_cc_mounts.py b/tests/unittests/config/test_cc_mounts.py
@@ -566,7 +566,7 @@ def test_fstab_mounts_combinations(self):
             LABEL=UEFI
             /dev/sda4	/mnt2	auto	nofail,comment=cloudconfig	1	2
             /dev/sda5	/mnt3	auto	defaults,nofail,x-systemd.after=cloud-init-network.service,_netdev,comment=cloudconfig	0	2
-            /dev/sda1	/mnt	xfs	defaults,nofail,x-systemd.after=cloud-init-network.service,_netdev,comment=cloudconfig	0	2
+            /dev/sda1	/mnt	xfs	auto,comment=cloudconfig	0	2
             /dev/sda3	/mnt4	btrfs	defaults,nofail,x-systemd.after=cloud-init-network.service,_netdev,comment=cloudconfig	0	2
             /dev/sdb1	none	swap	sw,comment=cloudconfig	0	0
             """  # noqa: E501