diff options
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rwxr-xr-x | rc.d/init.d/netfs | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/initscripts.spec b/initscripts.spec index db30ec37..ae4ef29c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -9,7 +9,7 @@ Source: initscripts-%{version}.tar.gz BuildRoot: /var/tmp/initbld Requires: mingetty, bash, /bin/awk, /bin/sed, mktemp, e2fsprogs, console-tools Requires: procps, modutils >= 2.1.85-3, sysklogd >= 1.3.31 -Requires: setup >= 2.0.3, lsof +Requires: setup >= 2.0.3, psmisc Conflicts: kernel <= 2.2, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3 Conflicts: initscripts < 1.22.1-5 Obsoletes: rhsound diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index 3d03f403..ec679d1e 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -40,7 +40,6 @@ case "$1" in ;; stop) [ -n "$NFSMTAB" ] && { - if [ $# -eq 1 ]; then sig= retry=3 remaining=`awk '!/^#/ && $3 ~ /^nfs/ {print $2}' /proc/mounts` @@ -54,14 +53,11 @@ case "$1" in sleep 2 remaining=`awk '!/^#/ && $3 ~ /^nfs/ {print $2}' /proc/mounts` [ -z "$remaining" ] && break - lsof -N fuser -k -m $sig $remaining >/dev/null sleep 5 retry=`expr $retry - 1` sig=-9 done - - fi } [ -n "$SMBMTAB" ] && action "Unmounting SMB filesystems" umount -a -t smbfs [ -n "$NCPMTAB" ] && action "Unmounting NCP filesystems" umount -a -t ncpfs |