From: jacob <jacob>
Date: Thu, 7 Jul 2005 21:47:47 +0000 (+0000)
Subject:  - add things to /etc/modules.conf | /etc/modprobe.conf
X-Git-Tag: v1_7_140~1^12~3^2~55^5~95
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=da78fcc765d7bfe33794495522f0fc0508c8c713;p=fs%2Flustre-release.git

 - add things to /etc/modules.conf | /etc/modprobe.conf
 - tweaks to init scripts for SLES 9
---

diff --git a/lustre/scripts/lustre b/lustre/scripts/lustre
index b6398c1..79a54e7 100755
--- a/lustre/scripts/lustre
+++ b/lustre/scripts/lustre
@@ -10,10 +10,10 @@
 # pidfile: /var/run/lustre.pid
 ### BEGIN INIT INFO
 # Provides: lustre
-# Required-Start:
-# Required-Stop: 
-# Should-Start: scance
-# Should-Stop: scance
+# Required-Start: $network
+# Required-Stop: $network
+# Should-Start:
+# Should-Stop:
 # Default-Start: 
 # Default-Stop: 0 1 2 6
 # Short-Description: Lustre Lite network File System.
diff --git a/lustre/scripts/lustrefs b/lustre/scripts/lustrefs
index af2e675..56cf7ec 100644
--- a/lustre/scripts/lustrefs
+++ b/lustre/scripts/lustrefs
@@ -14,15 +14,14 @@
 #
 ### BEGIN INIT INFO
 # Provides: lustrefs
-# Required-Start: $network
-# Required-Stop: $network
+# Required-Start: $network $remote_fs
+# Required-Stop: $network $remote_fs
 # Should-Start: 
 # Should-Stop: 
-# Default-Start: 
+# Default-Start: 3 5
 # Default-Stop: 0 1 2 6
 # Short-Description: Mounts and unmounts all Lustre mount points.
 ### END INIT INFO
-## Provides: $local_fs $remote_fs
 
 # Source function library.
 if [ -f /etc/init.d/functions ]; then
@@ -39,6 +38,9 @@ if [ -f /lib/lsb/init-functions ]; then
    . /lib/lsb/init-functions
 fi
 
+[ -x /sbin/fuser ] && FUSER=/sbin/fuser
+[ -x /bin/fuser ] && FUSER=/bin/fuser
+
 # Check that networking is up.
 [ "${NETWORKING}" = "no" ] && exit 0
 
@@ -85,7 +87,7 @@ case "$1" in
 			sleep 2
 			remaining=`LC_ALL=C awk '!/^#/ && $3 ~ /^lustre/ && $2 != "/" {print $2}' /proc/mounts`
 			[ -z "$remaining" ] && break
-			/sbin/fuser -k -m $sig $remaining >/dev/null
+			$FUSER -k -m $sig $remaining >/dev/null
 			sleep 5
 			retry=$(($retry - 1))
 			sig=-9