diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-10-17 19:56:43 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-10-18 09:35:39 +0100 |
| commit | 9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3 (patch) | |
| tree | 3a122662900195e7b14067a03cd5124358db9daf /rc.d/init.d | |
| parent | 423b437e3d29673dfad4051515506e6d711d20e6 (diff) | |
| parent | 8f5a82934f801ec94847fc899d235a39df9967a7 (diff) | |
| download | initscripts-9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3.tar initscripts-9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3.tar.gz initscripts-9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3.tar.bz2 initscripts-9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3.tar.xz initscripts-9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3.zip | |
Merge tag 'initscripts-9.50-1' into distro/mgauser/colin/update-to-9-50
Tag as initscripts-9.50-1
Conflicts:
Makefile
lang.csh
lang.sh
po/Makefile
rc.d/init.d/network
service
sysconfig.txt
sysconfig/init
sysconfig/network-scripts/ifup
sysconfig/network-scripts/ifup-eth
sysconfig/network-scripts/ifup-ippp
sysconfig/network-scripts/network-functions
sysctl.conf
systemd/fedora-storage-init
Diffstat (limited to 'rc.d/init.d')
| -rwxr-xr-x | rc.d/init.d/network | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 0da31c60..afac33d3 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -200,15 +200,6 @@ case "$1" in exit 1 fi - # 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 - NETMOUNTS=$(findmnt -n -m -t nfs,nfs4,smbfs,ncpfs,cifs 2>/dev/null) - if [ -n "$NETMOUNTS" ] ; then - /etc/init.d/netfs stop - fi - fi - vlaninterfaces="" vpninterfaces="" xdslinterfaces="" @@ -253,6 +244,7 @@ case "$1" in done for i in $vpninterfaces $xdslinterfaces $bridgeinterfaces $vlaninterfaces $remaining; do + unset DEVICE TYPE (. "./ifcfg-$i" if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi |