ailiopoulos/ocfs2-tools
1
0
Fork 0
forked from pool/ocfs2-tools
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocfs2-tools?expand=0&rev=12

Browse Source
This commit is contained in:
OBS User unknown 2008-11-25 14:56:22 +00:00 committed by Git OBS Bridge
parent a489bba956
commit b143cd7add
3 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
change-quotafile-names.diff Normal file
View File

@ -0,0 +1,30 @@
diff --git a/include/ocfs2-kernel/ocfs2_fs.h b/include/ocfs2-kernel/ocfs2_fs.h
index d27b098..b29abdc 100644
--- a/include/ocfs2-kernel/ocfs2_fs.h
+++ b/include/ocfs2-kernel/ocfs2_fs.h
@@ -354,8 +354,8 @@ static struct ocfs2_system_inode_info ocfs2_system_inodes[NUM_SYSTEM_INODES] = {
[JOURNAL_SYSTEM_INODE] = { "journal:%04d", OCFS2_JOURNAL_FL, S_IFREG | 0644 },
[LOCAL_ALLOC_SYSTEM_INODE] = { "local_alloc:%04d", OCFS2_BITMAP_FL | OCFS2_LOCAL_ALLOC_FL, S_IFREG | 0644 },
[TRUNCATE_LOG_SYSTEM_INODE] = { "truncate_log:%04d", OCFS2_DEALLOC_FL, S_IFREG | 0644 },
- [LOCAL_USER_QUOTA_SYSTEM_INODE] = { "aquota%04d.user", OCFS2_QUOTA_FL, S_IFREG | 0644 },
- [LOCAL_GROUP_QUOTA_SYSTEM_INODE] = { "aquota%04d.group", OCFS2_QUOTA_FL, S_IFREG | 0644 },
+ [LOCAL_USER_QUOTA_SYSTEM_INODE] = { "aquota.user:%04d", OCFS2_QUOTA_FL, S_IFREG | 0644 },
+ [LOCAL_GROUP_QUOTA_SYSTEM_INODE] = { "aquota.group:%04d", OCFS2_QUOTA_FL, S_IFREG | 0644 },
};
/* Parameter passed from mount.ocfs2 to module */
diff --git a/mkfs.ocfs2/mkfs.c b/mkfs.ocfs2/mkfs.c
index 9fe2ac2..441df68 100644
--- a/mkfs.ocfs2/mkfs.c
+++ b/mkfs.ocfs2/mkfs.c
@@ -104,8 +104,8 @@ static SystemFileInfo system_files[] = {
{ "journal:%04d", SFI_JOURNAL, 0, S_IFREG | 0644 },
{ "local_alloc:%04d", SFI_LOCAL_ALLOC, 0, S_IFREG | 0644 },
{ "truncate_log:%04d", SFI_TRUNCATE_LOG, 0, S_IFREG | 0644 },
- { "aquota%04d.user", SFI_QUOTA, 0, S_IFREG | 0644 },
- { "aquota%04d.group", SFI_QUOTA, 0, S_IFREG | 0644 },
+ { "aquota.user:%04d", SFI_QUOTA, 0, S_IFREG | 0644 },
+ { "aquota.group:%04d", SFI_QUOTA, 0, S_IFREG | 0644 },
};
struct fs_type_translation {

6
ocfs2-tools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Nov 22 02:37:05 CET 2008 - mfasheh@suse.com
- Add a quota fixup patch to match up system file names in tools
with the kernel.
-------------------------------------------------------------------
Wed Nov 12 11:25:01 CET 2008 - abeekhof@suse.de

7
ocfs2-tools.spec
View File

@ -22,7 +22,7 @@ Name: ocfs2-tools
BuildRequires: e2fsprogs-devel glib2-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files
Summary: Oracle Cluster File System 2 Core Tools
Version: 1.4.1
Release: 5
Release: 6
License: GPL v2 or later
Group: System/Filesystems
Source: ocfs2-tools.tar.bz2
@ -30,6 +30,7 @@ Source1: o2cb.ocf
Patch5: ocfs2-tools-static-glib.diff
Patch99: ocfs2-devel.diff
Patch100: ocfs2-quota.diff
Patch101: change-quotafile-names.diff
Url: http://oss.oracle.com/projects/ocfs2-tools/
Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
PreReq: %insserv_prereq %fillup_prereq
@ -91,6 +92,7 @@ Authors:
%patch5 -p1
%patch99 -p1
%patch100 -p1
%patch101 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
@ -196,6 +198,9 @@ fi
%{_libdir}/pkgconfig/ocfs2.pc
%changelog
* Sat Nov 22 2008 mfasheh@suse.com
- Add a quota fixup patch to match up system file names in tools
with the kernel.
* Wed Nov 12 2008 abeekhof@suse.de
- Add an OCF-style script to allow Pacemaker to reliably manage the
ocfs2 modules. The existing LSB-style one is inadequate.