From 618ba12b9e0d417d47fed55f23ce24acabbd2e6f Mon Sep 17 00:00:00 2001 From: James Simmons Date: Mon, 6 Aug 2018 16:00:58 -0400 Subject: [PATCH] LU-11176 systemd: use univeral path for modprobe The program modprobe is not the same on all platforms. On RHEL systems it is located in /usr/sbin. For Ubuntu/Debian which is busybox based /sbin/modprobe is a symlink to /bin/kmod. On all platforms to keep some sort of standard a symlink for modprobe exist in /sbin. Update the lnet.service script to use the hard patch /sbin/modprobe Test-Parameters: trivial Lustre-change: https://review.whamcloud.com/32520 Lustre-commit: 574e63fc86553510d87d02cd6d72785f341e48dc Change-Id: I54342971a6ee1aa4ce86a9fae0ac4dcb167b1510 Signed-off-by: James Simmons Reviewed-on: https://review.whamcloud.com/32944 Tested-by: Jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Li Dongyang Reviewed-by: Oleg Drokin Reviewed-on: https://review.whamcloud.com/32970 Reviewed-by: Thomas Stibor Reviewed-by: John L. Hammond --- lustre/scripts/systemd/lnet.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre/scripts/systemd/lnet.service.in b/lustre/scripts/systemd/lnet.service.in index 29aa151..4343050 100644 --- a/lustre/scripts/systemd/lnet.service.in +++ b/lustre/scripts/systemd/lnet.service.in @@ -9,7 +9,7 @@ ConditionPathExists=!/proc/sys/lnet/ [Service] Type=oneshot RemainAfterExit=true -ExecStart=@sbindir@/modprobe lnet +ExecStart=/sbin/modprobe lnet @BUILD_DLC_FALSE@ExecStart=@sbindir@/lctl network up @BUILD_DLC_FALSE@ExecStart=@sbindir@/lustre_routes_config @sysconfdir@/lnet_routes.conf @BUILD_DLC_TRUE@ExecStart=@sbindir@/lnetctl lnet configure -- 1.8.3.1