diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-12-14 17:49:19 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2011-12-14 17:49:19 -0500 |
| commit | 3031ac68e251d5090c3e021fb387a9ba0c8f343d (patch) | |
| tree | 9457360dd484c298115b3b6125db6169d07248b5 /rc.d | |
| parent | 0a698d43fac040fed96b18573a0f55c8d74327b8 (diff) | |
| download | initscripts-3031ac68e251d5090c3e021fb387a9ba0c8f343d.tar initscripts-3031ac68e251d5090c3e021fb387a9ba0c8f343d.tar.gz initscripts-3031ac68e251d5090c3e021fb387a9ba0c8f343d.tar.bz2 initscripts-3031ac68e251d5090c3e021fb387a9ba0c8f343d.tar.xz initscripts-3031ac68e251d5090c3e021fb387a9ba0c8f343d.zip | |
Add cifs to check for network filesystem (#760018).
Use findmnt to simplify the code.
Diffstat (limited to 'rc.d')
| -rwxr-xr-x | rc.d/init.d/network | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network index c6b86c37..93b93d9d 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -184,10 +184,8 @@ case "$1" in # If this is a final shutdown/halt, check for network FS, # and unmount them even if the user didn't turn on netfs if [ "$RUNLEVEL" = "6" -o "$RUNLEVEL" = "0" -o "$RUNLEVEL" = "1" ]; then - NFSMTAB=$(LC_ALL=C awk '$3 ~ /^nfs/ { print $2 }' /proc/mounts) - SMBMTAB=$(LC_ALL=C awk '$3 == "smbfs" { print $2 }' /proc/mounts) - NCPMTAB=$(LC_ALL=C awk '$3 == "ncpfs" { print $2 }' /proc/mounts) - if [ -n "$NFSMTAB" -o -n "$SMBMTAB" -o -n "$NCPMTAB" ] ; then + NETMOUNTS=$(findmnt -m -t nfs,nfs4,smbfs,ncpfs,cifs 2>/dev/null) + if [ -n "$NETMOUNTS" ] ; then /etc/init.d/netfs stop fi fi |