From 93f30bbfcb073fd8213c18c2e7eb7f857234fc8a Mon Sep 17 00:00:00 2001 From: James Falcon Date: Thu, 29 Aug 2024 18:22:23 -0400 Subject: [PATCH] fix: properly handle blank lines in fstab (#5643) Reference:https://github.com/canonical/cloud-init/commit/93f30bbfcb073fd8213c18c2e7eb7f857234fc8a Conflict:(1)not change test, the corresponding test case does not exist. (2)change handle() not parse_fstab(), diff commit is d15a770. --- cloudinit/config/cc_mounts.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py index 4efa2a2..1cd53ef 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -459,8 +459,9 @@ def handle(name: str, cfg: Config, cloud: Cloud, args: list) -> None: toks = WS.split(line) except Exception: pass - fstab_devs[toks[0]] = line - fstab_lines.append(line) + if toks: + fstab_devs[toks[0]] = line + fstab_lines.append(line) device_aliases = cfg.get("device_aliases", {}) -- 2.33.0