From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 24 Jan 2025 17:35:21 +0000 (+0900)
Subject: mount-util: make path_get_mount_info_at() also read utab
X-Git-Tag: v258-rc1~1479^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22f980dd0b04e65dbdc2fca9c653119459a2c52f;p=thirdparty%2Fsystemd.git

mount-util: make path_get_mount_info_at() also read utab

As "_netdev" is only stored in utab.

Fixes a bug introduced by 5261c521e3a98932241f36e91cf6f7823c578aca.
Fixes #35949.
---

diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c
index 9e2d70b30aa..720965c46e8 100644
--- a/src/shared/mount-util.c
+++ b/src/shared/mount-util.c
@@ -1894,7 +1894,9 @@ static int path_get_mount_info_at(
         if (r < 0)
                 return log_debug_errno(r, "Failed to get mount ID: %m");
 
-        r = libmount_parse("/proc/self/mountinfo", NULL, &table, &iter);
+        /* When getting options is requested, do not pass filename, otherwise utab will not read, and
+         * userspace options like "_netdev" will be lost. */
+        r = libmount_parse(ret_options ? NULL : "/proc/self/mountinfo", /* source = */ NULL, &table, &iter);
         if (r < 0)
                 return log_debug_errno(r, "Failed to parse /proc/self/mountinfo: %m");