Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-7451 kernel: kernel upgrade RHEL7.2 [3.10.0-327.3.1.el7]
[fs/lustre-release.git]
/
lustre
/
conf
/
Makefile.am
diff --git
a/lustre/conf/Makefile.am
b/lustre/conf/Makefile.am
index
2f25ba2
..
9dd742d
100644
(file)
--- a/
lustre/conf/Makefile.am
+++ b/
lustre/conf/Makefile.am
@@
-28,6
+28,8
@@
# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms.
#
# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms.
#
+# Copyright (c) 2014, 2015, Intel Corporation.
+#
#
# This file is part of Lustre, http://www.lustre.org/
#
# This file is part of Lustre, http://www.lustre.org/
@@
-35,7
+37,7
@@
#
EXTRA_DIST = lustre.dtd slapd-lustre.conf lustre2ldif.xsl top.ldif \
#
EXTRA_DIST = lustre.dtd slapd-lustre.conf lustre2ldif.xsl top.ldif \
- 99-lustre.rules lustre ldev.conf
+ 99-lustre.rules lustre ldev.conf
ko2iblnd.conf
ldapconfdir = $(sysconfdir)/openldap
if UTILS
ldapconfdir = $(sysconfdir)/openldap
if UTILS
@@
-46,7
+48,14
@@
endif
udevrulesdir = $(sysconfdir)/udev/rules.d
udevrules_DATA = 99-lustre.rules
udevrulesdir = $(sysconfdir)/udev/rules.d
udevrules_DATA = 99-lustre.rules
+if RHEL
+if SERVER
sysconfigdir = $(sysconfdir)/sysconfig
sysconfig_DATA = lustre
sysconfigdir = $(sysconfdir)/sysconfig
sysconfig_DATA = lustre
+endif
+endif
+
+modprobedir = $(sysconfdir)/modprobe.d
+modprobe_DATA = ko2iblnd.conf
sysconf_DATA = ldev.conf
sysconf_DATA = ldev.conf