Skip to content

Commit 3d161fd

Browse files
anoobsMarkSymsCtx
authored andcommitted
cifs.conf: Remove cifs.conf
In Linux 4.14 cifs module has soft dependencies (pre) on crypto modules. This soft dependencies makes kmod (modprobe) ignore commands inside /etc/modprobe.d/cifs.conf. cifs.conf contains command to change default value of SecurityFlags from 0x85 to 0x83. Since the commands inside cifs.conf are ignored while cifs module is loaded, SecurityFlags remains at 0x85, breaking few tests. Remove cifs.conf and change default value of SecurityFlags (by adding a kernel patch) to 0x83 Signed-off-by: Mark Syms <mark.syms@citrix.com> Signed-off-by: Anoob Soman <anoob.soman@citrix.com>
1 parent 941ab27 commit 3d161fd

File tree

3 files changed

+0
-5
lines changed

3 files changed

+0
-5
lines changed

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ SM_LIBS += cbtutil
6868
UDEV_RULES = 40-multipath 55-xs-mpath-scsidev 57-usb 58-xapi
6969
MPATH_DAEMON = sm-multipath
7070
MPATH_CONF = multipath.conf
71-
CIFS_CONF = cifs.conf
7271
SMLOG_CONF = SMlog
7372

7473
SM_XML := XE_SR_ERRORCODES
@@ -156,8 +155,6 @@ install: precheck
156155
$(SM_STAGING)/$(MPATH_CONF_DIR)
157156
install -m 755 multipath/$(MPATH_DAEMON) \
158157
$(SM_STAGING)/$(INIT_DIR)
159-
install -m 644 etc/modprobe.d/$(CIFS_CONF) \
160-
$(SM_STAGING)/$(MODPROBE_DIR)
161158
install -m 644 etc/logrotate.d/$(SMLOG_CONF) \
162159
$(SM_STAGING)/$(LOGROTATE_DIR)
163160
install -m 644 drivers/updatempppathd.service \

etc/modprobe.d/cifs.conf

Lines changed: 0 additions & 1 deletion
This file was deleted.

mk/sm.spec.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@ tests/run_python_unittests.sh
348348
%config /etc/udev/rules.d/58-xapi.rules
349349
%config /etc/multipath.xenserver/multipath.conf
350350
%config /etc/udev/rules.d/69-dm-lvm-metad.rules
351-
%config /etc/modprobe.d/cifs.conf
352351
%config /etc/logrotate.d/SMlog
353352
%doc CONTRIB LICENSE MAINTAINERS README.md WHATS_NEW
354353

0 commit comments

Comments
 (0)