diff options
author | Tom Gundersen <teg@jklm.no> | 2012-07-12 02:15:28 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2012-07-12 02:15:28 +0200 |
commit | 046d35bac04022eab343e9e6e40a3056c5e653ad (patch) | |
tree | b26a2d23796c4c8eb473d796154575050a689720 /network | |
parent | 3779f7002c8417a77745e1e02273ed5e19ed75b7 (diff) | |
parent | c2f7b97924e2b5341cea667fbd1a2802e9cb8cd5 (diff) | |
download | initscripts-046d35bac04022eab343e9e6e40a3056c5e653ad.tar.xz |
Merge branch 'spelling'
Conflicts:
rc.sysinit
Had to manually fix up a conflict in some comments.
Diffstat (limited to 'network')
-rwxr-xr-x | network | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -235,15 +235,15 @@ case "$1" in # deprecation check need_legacy && deprecated if ! ck_daemon network; then - echo "Network is already running. Try 'network restart'" + echo "Network is already running. Try 'network restart'" exit fi - stat_busy "Starting Network" + stat_busy "Starting network" error=0 if need_legacy; then # bring up bridge interfaces bridge_up - # bring up ethernet interfaces + # bring up Ethernet interfaces for ifline in ${INTERFACES[@]}; do if [[ $ifline = ${ifline#!} ]]; then ifup $ifline || error=1 @@ -271,11 +271,11 @@ case "$1" in # deprecation check need_legacy && deprecated if [[ $NETWORK_PERSIST =~ yes|YES && $RUNLEVEL == [06] ]]; then - status "Skipping Network Shutdown" true + status "Skipping network shutdown" true exit 0 fi - stat_busy "Stopping Network" + stat_busy "Stopping network" rm_daemon network error=0 if need_legacy; then |