diff options
| author | Florian La Roche <laroche@redhat.com> | 2003-04-18 21:09:07 +0000 |
|---|---|---|
| committer | Florian La Roche <laroche@redhat.com> | 2003-04-18 21:09:07 +0000 |
| commit | a31c7a30dced003c0f96025fa76364eb523e832c (patch) | |
| tree | 904347a550becd8209e41ad4f5dbd7f30d1ca0ff /rc.d/init.d/network | |
| parent | 475e9481742a2dc8419909e0fd6e257dc9b3c404 (diff) | |
| download | initscripts-a31c7a30dced003c0f96025fa76364eb523e832c.tar initscripts-a31c7a30dced003c0f96025fa76364eb523e832c.tar.gz initscripts-a31c7a30dced003c0f96025fa76364eb523e832c.tar.bz2 initscripts-a31c7a30dced003c0f96025fa76364eb523e832c.tar.xz initscripts-a31c7a30dced003c0f96025fa76364eb523e832c.zip | |
- new releaser7-16
Diffstat (limited to 'rc.d/init.d/network')
| -rwxr-xr-x | rc.d/init.d/network | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 36d06a77..333c38d8 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -111,45 +111,22 @@ case "$1" in is_available $i continue fi - # If we're in confirmation mode, get user confirmation - [ -n "$CONFIRM" ] && - { - confirm $i - case $? in - 0) - : - ;; - 2) - CONFIRM= - ;; - *) - continue - ;; - esac - } - + # If we're in confirmation mode, get user confirmation. + if [ -f /var/run/confirm ]; then + confirm $i + test $? = 1 && continue + fi action $"Bringing up interface $i: " ./ifup $i boot done # Bring up CIPE VPN interfaces for i in $cipeinterfaces ; do if ! LANG=C egrep -L "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i >/dev/null 2>&1 ; then - # If we're in confirmation mode, get user confirmation - [ -n "$CONFIRM" ] && - { + # If we're in confirmation mode, get user confirmation. + if [ -f /var/run/confirm ]; then confirm $i - case $? in - 0) - : - ;; - 2) - CONFIRM= - ;; - *) - continue - ;; - esac - } + test $? = 1 && continue + fi action $"Bringing up interface $i: " ./ifup $i boot fi done |