39 lines
2.3 KiB
Diff
39 lines
2.3 KiB
Diff
From fef6198a931a9d7538c0c93a446fd02ffc52fc79 Mon Sep 17 00:00:00 2001
|
|
From: David Tardon <dtardon@redhat.com>
|
|
Date: Thu, 25 Jun 2026 14:26:45 +0200
|
|
Subject: [PATCH] Revert "mount-setup: tune down log level if usrquota is not
|
|
supported, apply usrquota when smack is in use too"
|
|
|
|
This reverts commit d5642d888c6bc1b8014b727b6b1b4851a0829239.
|
|
|
|
Reverts: RHEL-143028
|
|
---
|
|
src/shared/mount-setup.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
|
|
index 4c5151c7db..93e646d045 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|MNT_USRQUOTA_GRACEFUL },
|
|
+ mac_smack_use, MNT_FATAL },
|
|
#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_full_errno(priority, r, "Unable to determine whether %s supports 'usrquota' mount option, assuming not: %m", p->type);
|
|
+ log_warning_errno(r, "Unable to determine whether %s supports 'usrquota' mount option, assuming not: %m", p->type);
|
|
else if (r == 0)
|
|
- log_debug("Not enabling 'usrquota' on '%s' as kernel lacks support for it.", p->where);
|
|
+ log_info("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();
|