From: Mike Yuan <me@yhndnzj.com>
Date: Thu, 6 Mar 2025 12:14:13 +0000 (+0100)
Subject: mount-setup: tune down log level if usrquota is not supported, apply usrquota when... 
X-Git-Tag: v258-rc1~1138^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F36668%2Fhead;p=thirdparty%2Fsystemd.git

mount-setup: tune down log level if usrquota is not supported, apply usrquota when smack is in use too

Follow-up for 8f5131fb9e7979022521d685e69b6419f0884677
---

diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
index 93e646d0450..4c5151c7db8 100644
--- a/src/shared/mount-setup.c
+++ b/src/shared/mount-setup.c
@@ -90,7 +90,7 @@ static const MountPoint mount_table[] = {
         { "smackfs",     "/sys/fs/smackfs",           "smackfs",    "smackfsdef=*",                             MS_NOSUID|MS_NOEXEC|MS_NODEV,
           mac_smack_use, MNT_FATAL                  },
         { "tmpfs",       "/dev/shm",                  "tmpfs",      "mode=01777,smackfsroot=*",                 MS_NOSUID|MS_NODEV|MS_STRICTATIME,
-          mac_smack_use, MNT_FATAL                  },
+          mac_smack_use, MNT_FATAL|MNT_USRQUOTA_GRACEFUL },
 #endif
         { "tmpfs",       "/dev/shm",                  "tmpfs",      "mode=01777",                               MS_NOSUID|MS_NODEV|MS_STRICTATIME,
           NULL,          MNT_FATAL|MNT_IN_CONTAINER|MNT_USRQUOTA_GRACEFUL },
@@ -194,9 +194,9 @@ static int mount_one(const MountPoint *p, bool relabel) {
         if (FLAGS_SET(p->mode, MNT_USRQUOTA_GRACEFUL)) {
                 r = mount_option_supported(p->type, "usrquota", /* value= */ NULL);
                 if (r < 0)
-                        log_warning_errno(r, "Unable to determine whether %s supports 'usrquota' mount option, assuming not: %m", p->type);
+                        log_full_errno(priority, r, "Unable to determine whether %s supports 'usrquota' mount option, assuming not: %m", p->type);
                 else if (r == 0)
-                        log_info("Not enabling 'usrquota' on '%s' as kernel lacks support for it.", p->where);
+                        log_debug("Not enabling 'usrquota' on '%s' as kernel lacks support for it.", p->where);
                 else {
                         if (!strextend_with_separator(&extend_options, ",", p->options ?: POINTER_MAX, "usrquota"))
                                 return log_oom();