aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig
diff options
context:
space:
mode:
Diffstat (limited to 'sysconfig')
-rwxr-xr-xsysconfig/network-scripts/ifdown8
-rwxr-xr-xsysconfig/network-scripts/ifup20
-rwxr-xr-xsysconfig/network-scripts/ifup-aliases3
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp10
-rwxr-xr-xsysconfig/network-scripts/ifup-routes5
-rwxr-xr-xsysconfig/network-scripts/ifup-sl10
6 files changed, 34 insertions, 22 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index fe1b3aba..53a28f8b 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -1,19 +1,21 @@
#!/bin/sh
PATH=/sbin:/usr/sbin:/bin:/usr/bin
+TEXTDOMAIN=initscripts
cd /etc/sysconfig/network-scripts
. network-functions
+. /etc/rc.d/init.d/functions
CONFIG=$1
[ -z "$CONFIG" ] && {
- echo "usage: ifdown <device name>" >&2
+ gprintf "usage: %s <device name>\n" ifdown >&2
exit 1
}
[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
[ -f "$CONFIG" ] || {
- echo "usage: ifdown <device name>" >&2
+ gprintf "usage: %s <device name>\n" ifdown >&2
exit 1
}
@@ -23,7 +25,7 @@ if [ $UID != 0 ]; then
exec /usr/sbin/usernetctl $CONFIG down
fi
fi
- echo "Users cannot control this device." >&2
+ gprintf "Users cannot control this device.\n" >&2
exit 1
fi
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index aa061a87..df2ecef1 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -1,21 +1,23 @@
#!/bin/bash
PATH=/sbin:/usr/sbin:/bin:/usr/bin
+TEXTDOMAIN=initscripts
cd /etc/sysconfig/network-scripts
. network-functions
+. /etc/rc.d/init.d/functions
need_hostname
CONFIG=${1}
[ -z "${CONFIG}" ] && {
- echo "usage: ifup <device name>" >&2
+ gprintf "usage: ifup <device name>\n" >&2
exit 1
}
[ -f "${CONFIG}" ] || CONFIG=ifcfg-${CONFIG}
[ -f "${CONFIG}" ] || {
- echo "usage: ifup <device name>" >&2
+ gprintf "usage: ifup <device name>\n" >&2
exit 1
}
@@ -25,7 +27,7 @@ if [ ${UID} != 0 ]; then
exec /usr/sbin/usernetctl ${CONFIG} up
fi
fi
- echo "Users cannot control this device." >&2
+ gprintf "Users cannot control this device.\n" >&2
exit 1
fi
@@ -72,7 +74,7 @@ fi
# is this device available? (this catches PCMCIA devices for us)
LC_ALL= LANG= /sbin/ifconfig ${REALDEVICE} 2>&1 | grep -s "not found" > /dev/null
if [ "$?" = "0" ]; then
- echo "Delaying ${DEVICE} initialization."
+ gprintf "Delaying %s initialization.\n" "${DEVICE}"
exit 1
fi
@@ -81,7 +83,7 @@ if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" -a \
RFLAG="" ; [ "${RECEIVEONLY}" = yes ] && RFLAG="-r"
ifconfig ${DEVICE} down
- echo "Enslaving ${DEVICE} to ${MASTER}"
+ gprintf "Enslaving %s to %s" "${DEVICE}" "${MASTER}"
ifenslave ${RFLAG} "${MASTER}" "${DEVICE}"
exit 0
@@ -106,14 +108,14 @@ if [ -n "${DYNCONFIG}" ]; then
PUMPARGS="${PUMPARGS} -d"
DHCPDARGS="${DHCPDARGS} -R"
fi
- echo -n "Determining IP information for ${DEVICE}..."
+ gprintf "Determining IP information for %s..." "${DEVICE}"
if [ -x /sbin/pump ] && /sbin/pump ${PUMPARGS} -i ${DEVICE} ; then
- echo " done."
+ gprintf " done.\n"
elif [ -x /sbin/dhcpcd ] && /sbin/dhcpcd ${DHCPCDARGS} ${DEVICE} ; then
- echo " done."
+ gprintf " done.\n"
else
- echo " failed."
+ gprintf " failed.\n"
exit 1
fi
else
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
index 82f0b0d8..23a9af96 100755
--- a/sysconfig/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases
@@ -58,10 +58,11 @@
# June 30, 1999
#
# modified by: Bill Nottingham <notting@redhat.com>
+TEXTDOMAIN=initscripts
device=$1
if [ "$device" = "" ]; then
- echo "usage: $0 <net-device>"
+ gprintf "usage: %s <net-device>\n" "$0"
exit 1
fi
diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index af44875d..0bdcc591 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -3,6 +3,8 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
cd /etc/sysconfig/network-scripts
. network-functions
+. /etc/rc.d/init.d/functions
+
# ifup-post for PPP is handled through /etc/ppp/ip-up
@@ -42,10 +44,10 @@ if [ "${2}" = "boot" -a "${ONBOOT}" = "no" ]; then
fi
[ -x /usr/sbin/pppd ] || {
- echo "/usr/sbin/pppd does not exist or is not executable"
- echo "ifup-ppp for ${DEVICE} exiting"
+ gprintf "/usr/sbin/pppd does not exist or is not executable\n"
+ gprintf "ifup-ppp for %s exiting\n" "${DEVICE}"
logger -p daemon.info -t ifup-ppp \
- "/usr/sbin/pppd does not exist or is not executable for ${DEVICE}"
+ `gprintf "/usr/sbin/pppd does not exist or is not executable for %s\n" "${DEVICE}"`
exit 1
}
@@ -53,7 +55,7 @@ fi
echo "/etc/sysconfig/network-scripts/chat-${DEVICE} does not exist"
echo "ifup-ppp for ${DEVICE} exiting"
logger -p daemon.info -t ifup-ppp \
- "/etc/sysconfig/network-scripts/chat-${DEVICE} does not exist for ${DEVICE}"
+ `gprintf "/etc/sysconfig/network-scripts/chat-%s does not exist for %s" "${DEVICE}" "${DEVICE}"`
exit 1
}
diff --git a/sysconfig/network-scripts/ifup-routes b/sysconfig/network-scripts/ifup-routes
index 7562d242..b4e4a98a 100755
--- a/sysconfig/network-scripts/ifup-routes
+++ b/sysconfig/network-scripts/ifup-routes
@@ -1,9 +1,12 @@
#!/bin/sh
+TEXTDOMAIN=initscripts
# adds static routes which go through device $1
+. /etc/rc.d/init.d/functions
+
if [ "$1" = "" ]; then
- echo "usage: $0 <net-device>"
+ gprintf "usage: %s <net-device>\n" "$0"
exit 1
fi
diff --git a/sysconfig/network-scripts/ifup-sl b/sysconfig/network-scripts/ifup-sl
index 45432d52..2b53b93e 100755
--- a/sysconfig/network-scripts/ifup-sl
+++ b/sysconfig/network-scripts/ifup-sl
@@ -1,5 +1,7 @@
#!/bin/sh
+TEXTDOMAIN=initscripts
PATH=/sbin:/usr/sbin:/bin:/usr/bin
+. /etc/rc.d/init.d/functions
# ifup-post can't be done for slip :-( Solution: use PPP
@@ -28,8 +30,8 @@ if [ -z "$RETRYTIMEOUT" ]; then
fi
[ -x /usr/sbin/dip ] || {
- echo "/usr/sbin/dip does not exist or is not executable"
- echo "ifup-sl for $DEVICE exiting"
+ gprintf "%s does not exist or is not executable\n" "/usr/sbin/dip"
+ gprintf "%s for %s exiting\n" "ifup-sl" "$DEVICE"
logger -p daemon.info -t ifup-sl \
"/usr/sbin/dip does not exist or is not executable for $DEVICE"
exit 1
@@ -40,8 +42,8 @@ DIPSCRIPT=/etc/sysconfig/network-scripts/dip-$DEVNAME
DIPSCRIPT=/etc/sysconfig/network-scripts/dip-$PARENTDEVNAME
}
[ -f $DIPSCRIPT ] || {
- echo "/etc/sysconfig/network-scripts/dip-$DEVICE does not exist"
- echo "ifup-sl for $DEVICE exiting"
+ gprintf "%s does not exist\n" "/etc/sysconfig/network-scripts/dip-$DEVICE"
+ gprintf "%s for %s exiting\n" "ifup-sl" "$DEVICE"
logger -p daemon.info -t ifup-sl \
"/etc/sysconfig/network-scripts/dip-$DEVICE does not exist for $DEVICE"
exit 1