From 9b1b04587c72e80142726e755424cb852f34ac28 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 21 Oct 2021 10:54:20 +0100 Subject: [PATCH] gunixmounts: Drop references to pamconsole mount option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was Red Hat specific when it was introduced in 2004, was never supported by mount(8) upstream, and was removed entirely in 2008. It’s confusing for GLib to keep references to it around. Thanks to Karel Zak for digging up the history of it: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2298#note_1294519 And thanks to Xidorn Quan for looking into it in the first place (see !2298). Signed-off-by: Philip Withnall --- gio/gunixmounts.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index e0c8f6778..ecfa61de8 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c @@ -1062,7 +1062,6 @@ _g_get_unix_mount_points (void) if ((mount_fstype != NULL && g_strcmp0 ("supermount", mount_fstype) == 0) || ((userspace_flags & MNT_MS_USER) && (g_strstr_len (mount_options, -1, "user_xattr") == NULL)) || - (g_strstr_len (mount_options, -1, "pamconsole") == NULL) || (userspace_flags & MNT_MS_USERS) || (userspace_flags & MNT_MS_OWNER)) { @@ -1158,7 +1157,6 @@ _g_get_unix_mount_points (void) #ifdef HAVE_HASMNTOPT || (hasmntopt (mntent, "user") != NULL && hasmntopt (mntent, "user") != hasmntopt (mntent, "user_xattr")) - || hasmntopt (mntent, "pamconsole") != NULL || hasmntopt (mntent, "users") != NULL || hasmntopt (mntent, "owner") != NULL #endif @@ -1231,7 +1229,6 @@ _g_get_unix_mount_points (void) #ifdef HAVE_HASMNTOPT || (hasmntopt (&mntent, "user") != NULL && hasmntopt (&mntent, "user") != hasmntopt (&mntent, "user_xattr")) - || hasmntopt (&mntent, "pamconsole") != NULL || hasmntopt (&mntent, "users") != NULL || hasmntopt (&mntent, "owner") != NULL #endif