From ce2ed1872f3644ade361b6b85de0e7fc829eaaa0 Mon Sep 17 00:00:00 2001
From: Gang He <ghe@suse.com>
Date: Thu, 29 Oct 2020 10:53:32 +0000
Subject: [PATCH] Accepting request 844843 from
 home:ganghe:branches:openSUSE:Factory

- Point out the default value of mount options (bsc#1178248)
  + mount.ocfs2-point-out-the-default-value-of-mount-opt.patch

OBS-URL: https://build.opensuse.org/request/show/844843
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=128
---
 ...t-out-the-default-value-of-mount-opt.patch | 44 +++++++++++++++++++
 ocfs2-tools.changes                           |  6 +++
 ocfs2-tools.spec                              |  2 +
 3 files changed, 52 insertions(+)
 create mode 100644 mount.ocfs2-point-out-the-default-value-of-mount-opt.patch

diff --git a/mount.ocfs2-point-out-the-default-value-of-mount-opt.patch b/mount.ocfs2-point-out-the-default-value-of-mount-opt.patch
new file mode 100644
index 0000000..b3cd7d5
--- /dev/null
+++ b/mount.ocfs2-point-out-the-default-value-of-mount-opt.patch
@@ -0,0 +1,44 @@
+From faf103905ec641f1266b93e584d4949cd4ef49cd Mon Sep 17 00:00:00 2001
+From: Gang He <ghe@suse.com>
+Date: Thu, 29 Oct 2020 17:34:35 +0800
+Subject: [PATCH] mount.ocfs2: point out the default value of mount options
+
+The default value of some mount options should be clearly pointed
+out in the man page. e.g. update access time, acl, user_xattr.
+This can help users to simplify mount command line.
+
+Signed-off-by: Gang He <ghe@suse.com>
+---
+ mount.ocfs2/mount.ocfs2.8.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mount.ocfs2/mount.ocfs2.8.in b/mount.ocfs2/mount.ocfs2.8.in
+index a36bdc8c..ff78d193 100644
+--- a/mount.ocfs2/mount.ocfs2.8.in
++++ b/mount.ocfs2/mount.ocfs2.8.in
+@@ -26,7 +26,7 @@ The file system will not update access time.
+ .TP
+ \fBrelatime\fR
+ The file system will update atime only if the on-disk atime is older than mtime
+-or ctime.
++or ctime. This is the default mode.
+ 
+ .TP
+ \fBstrictatime,atime\_quantum=nrsec\fR
+@@ -36,11 +36,11 @@ zero to always update atime. These two options need work together.
+ 
+ .TP
+ \fB[no]acl\fR
+-Enables / disables POSIX ACLs (access control lists) support.
++Enables / disables POSIX ACLs (access control lists) support. It is enabled by default.
+ 
+ .TP
+ \fB[no]user_xattr\fR
+-Enables / disables extended user attributes.
++Enables / disables extended user attributes. It is enabled by default.
+ 
+ .TP
+ \fBcommit=nrsec\fR
+-- 
+2.12.3
+
diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes
index d0d0516..164482f 100644
--- a/ocfs2-tools.changes
+++ b/ocfs2-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 29 11:10:30 UTC 2020 - ghe@suse.com
+
+- Point out the default value of mount options (bsc#1178248)
+  + mount.ocfs2-point-out-the-default-value-of-mount-opt.patch
+
 -------------------------------------------------------------------
 Mon Aug 10 10:50:30 UTC 2020 - ghe@suse.com
 
diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec
index 299d213..4102da4 100644
--- a/ocfs2-tools.spec
+++ b/ocfs2-tools.spec
@@ -62,6 +62,7 @@ Patch503:       mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch
 Patch504:       fix-build-failure-with-glibc-2.28.patch
 Patch505:       debugfs.ocfs2-Fix-the-error-on-devices-with-sector-s.patch
 Patch506:       mount.ocfs2-add-nocluster-mount-option-support.patch
+Patch507:       mount.ocfs2-point-out-the-default-value-of-mount-opt.patch
 
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
@@ -176,6 +177,7 @@ OCFS2 filesystem.
 %patch504 -p1
 %patch505 -p1
 %patch506 -p1
+%patch507 -p1
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects