!262 [sync] PR-258: fix: properly handle blank lines in fstab

From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen

backport-fix-properly-handle-blank-lines-in-fstab-5643.patch

@@ -0,0 +1,32 @@
+From 93f30bbfcb073fd8213c18c2e7eb7f857234fc8a Mon Sep 17 00:00:00 2001
+From: James Falcon <james.falcon@canonical.com>
+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 2d645b3..f97b870 100644
+--- a/cloudinit/config/cc_mounts.py
++++ b/cloudinit/config/cc_mounts.py
+@@ -384,8 +384,9 @@ def handle(_name, cfg, cloud, log, _args):
+                 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
+
+

cloud-init.spec

@@ -1,6 +1,6 @@
 Name: cloud-init
 Version: 21.4
-Release: 30
+Release: 31
 Summary: the defacto multi-distribution package that handles early initialization of a cloud instance.
 License: ASL 2.0 or GPLv3
 URL: http://launchpad.net/cloud-init
@@ -83,6 +83,7 @@ Patch6048: backport-fix-openstack-Fix-bond-mac_address-5369.patch
 Patch6049: backport-fix-net-klibc-ipconfig-PROTO-compatibility-5437.patch
 Patch6050: backport-feat-Ensure-random-passwords-contain-multiple-charac.patch
 Patch6051: backport-test-Fix-duplicate-judgment-conditions-in-password-g.patch
+Patch6052: backport-fix-properly-handle-blank-lines-in-fstab-5643.patch
 
 BuildRequires: pkgconfig(systemd) python3-devel python3-setuptools systemd
 BuildRequires: iproute python3-configobj python3-httpretty >= 0.8.14-2
@@ -193,6 +194,12 @@ fi
 %exclude /usr/share/doc/*
 
 %changelog
+* Thu Nov 14 2024 shixuantong <shixuantong1@huawei.com> - 21.4-31
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix: properly handle blank lines in fstab
+
 * Mon Nov 04 2024 shixuantong <shixuantong1@huawei.com> - 21.4-30
 - Type:bugfix
 - CVE:NA