Change ignore to surrogateescape for kernelparameters

saltstack · Sep 12, 2022 · e0fd5f6 · e0fd5f6
1 parent 60e72ea
commit e0fd5f6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/salt/grains/core.py b/salt/grains/core.py
@@ -3170,7 +3170,9 @@ def kernelparams():
         return {}
     else:
         try:
-            with salt.utils.files.fopen("/proc/cmdline", "r", errors="ignore") as fhr:
+            with salt.utils.files.fopen(
+                "/proc/cmdline", "r", errors="surrogateescape"
+            ) as fhr:
                 cmdline = fhr.read()
                 grains = {"kernelparams": []}
                 for data in [

diff --git a/tests/pytests/unit/grains/proc-files/cmdline b/tests/pytests/unit/grains/proc-files/cmdline
@@ -1 +1 @@
-TEST_KEY1=VAL1 TEST_KEY2=VAL2� TEST_KEY_NOVAL TEST_KEY3=3
+TEST_KEY1=VAL1 TEST_KEY2=VAL2 BOOTABLE_FLAG="�" TEST_KEY_NOVAL TEST_KEY3=3
diff --git a/tests/pytests/unit/grains/test_core.py b/tests/pytests/unit/grains/test_core.py
@@ -2755,6 +2755,7 @@ def _open_mock(file_name, *args, **kwargs):
         "kernelparams": [
             ("TEST_KEY1", "VAL1"),
             ("TEST_KEY2", "VAL2"),
+            ("BOOTABLE_FLAG", "\udc80"),
             ("TEST_KEY_NOVAL", None),
             ("TEST_KEY3", "3"),
         ]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		TEST_KEY1=VAL1 TEST_KEY2=VAL2� TEST_KEY_NOVAL TEST_KEY3=3
		TEST_KEY1=VAL1 TEST_KEY2=VAL2 BOOTABLE_FLAG="�" TEST_KEY_NOVAL TEST_KEY3=3