aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
Diffstat (limited to 'rc.d')
-rw-r--r--rc.d/init.d/functions34
-rwxr-xr-xrc.d/init.d/network10
2 files changed, 0 insertions, 44 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 3e8b5ae0..19f389dd 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -103,22 +103,6 @@ checkpid() {
return 1
}
-__readlink() {
- ls -bl "$@" 2>/dev/null| awk '{ print $NF }'
-}
-
-__fgrep() {
- s=$1
- f=$2
- while read line; do
- if strstr "$line" "$s"; then
- echo $line
- return 0
- fi
- done < $f
- return 1
-}
-
# __proc_pids {program} [pidfile]
# Set $pid to pids from /var/run* for {program}. $pid should be declared
# local in the caller.
@@ -534,24 +518,6 @@ strstr() {
return 0
}
-# Confirm whether we really want to run this service
-confirm() {
- [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
- while : ; do
- echo -n $"Start service $1 (Y)es/(N)o/(C)ontinue? [Y] "
- read answer
- if strstr $"yY" "$answer" || [ "$answer" = "" ] ; then
- return 0
- elif strstr $"cC" "$answer" ; then
- rm -f /var/run/confirm
- [ -x /bin/plymouth ] && /bin/plymouth --show-splash
- return 2
- elif strstr $"nN" "$answer" ; then
- return 1
- fi
- done
-}
-
# Check whether file $1 is a backup or rpm-generated file and should be ignored
is_ignored_file() {
case "$1" in
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 359dffa2..9a6517a3 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -130,11 +130,6 @@ case "$1" in
is_available $i
continue
fi
- # 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
[ $? -ne 0 ] && rc=1
done
@@ -142,11 +137,6 @@ case "$1" in
# Bring up xDSL and VPN interfaces
for i in $vlaninterfaces $bridgeinterfaces $xdslinterfaces $vpninterfaces ; do
if ! LANG=C grep -EL "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i >/dev/null 2>&1 ; then
- # 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
[ $? -ne 0 ] && rc=1
fi