diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-03-25 16:17:16 -0400 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2011-06-01 14:20:11 +0200 |
| commit | 3618a104f3c785da16380cdd996907a1b6be1f93 (patch) | |
| tree | 8ba607485a51907e694224e0b80d6c14dce97093 /sysconfig/network-scripts/ifup-aliases | |
| parent | 7be692976830247605da27b37745315cd432f58d (diff) | |
| download | initscripts-3618a104f3c785da16380cdd996907a1b6be1f93.tar initscripts-3618a104f3c785da16380cdd996907a1b6be1f93.tar.gz initscripts-3618a104f3c785da16380cdd996907a1b6be1f93.tar.bz2 initscripts-3618a104f3c785da16380cdd996907a1b6be1f93.tar.xz initscripts-3618a104f3c785da16380cdd996907a1b6be1f93.zip | |
Use net_log where appropriate.
Conflicts:
rc.d/init.d/network
sysconfig/network-scripts/ifup-aliases
sysconfig/network-scripts/ifup-eth
[Harald Hoyer <harald@redhat.com>: resolved conflicts]
Diffstat (limited to 'sysconfig/network-scripts/ifup-aliases')
| -rwxr-xr-x | sysconfig/network-scripts/ifup-aliases | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases index 8b2dc732..5178b88a 100755 --- a/sysconfig/network-scripts/ifup-aliases +++ b/sysconfig/network-scripts/ifup-aliases @@ -125,7 +125,7 @@ eval ` ( # read defaults from the parent config file [ -f $PARENTCONFIG ] || { - echo $"Missing config file $PARENTCONFIG." >&2 + net_log $"Missing config file $PARENTCONFIG." exit 1 } eval ` ( @@ -168,7 +168,7 @@ function new_interface () DEVNUM=${DEVICE#*:} if (LC_ALL=C; [[ ! "$DEVNUM" =~ '^[0-9A-Za-z_]*$' ]]); then - echo $"error in $FILE: invalid alias number" >&2 + net_log $"error in $FILE: invalid alias number" >&2 return 1 fi @@ -178,17 +178,17 @@ function new_interface () "; if [ -n "$ipseen" ]; then - echo $"error in $FILE: already seen ipaddr $IPADDR in $ipseen" >&2 + net_log $"error in $FILE: already seen ipaddr $IPADDR in $ipseen" return 1 fi if [ -n "$devseen" ]; then - echo $"error in $FILE: already seen device $parent_device:$DEVNUM in $devseen" >&2 + net_log $"error in $FILE: already seen device $parent_device:$DEVNUM in $devseen" return 1 fi if [ -z "$DEVICE" -o -z "$IPADDR" ]; then - echo $"error in $FILE: didn't specify device or ipaddr" >&2 + net_log $"error in $FILE: didn't specify device or ipaddr" return 1 fi @@ -255,7 +255,7 @@ function new_interface () setup_this=yes fi if [ -n "$rdev_mark" -a "$rdev_mark" != "$newmark" ]; then - echo $"error in ifcfg-${parent_device}: files" >&2 + net_log $"error in ifcfg-${parent_device}: files" return 1 fi eval " rdev_${DEVNUM}_mark=\$newmark "; @@ -266,7 +266,7 @@ function new_interface () if [ -n "$rdevip" -a "$rdevip" != "${DEVNUM}" ]; then eval " mark_remove=\$rdev_${rdevip}_mark "; if [ -n "$mark_remove" -a "$mark_remove" != "remove" ]; then - echo $"error in ifcfg-${parent_device}: files" >&2 + net_log $"error in ifcfg-${parent_device}: files" return 1 fi if [ "$mark_remove" != "remove" ]; then @@ -336,11 +336,11 @@ for FILE in ifcfg-${parent_device}-range* ; do ipaddr_endnum=${IPADDR_END##*.} if [ "${IPADDR_START%.*}" != "${IPADDR_END%.*}" ]; then - echo $"error in $FILE: IPADDR_START and IPADDR_END don't agree" >&2; continue + net_log $"error in $FILE: IPADDR_START and IPADDR_END don't agree"; continue fi if [ $ipaddr_startnum -gt $ipaddr_endnum ]; then - echo $"error in $FILE: IPADDR_START greater than IPADDR_END" >&2; continue + net_log $"error in $FILE: IPADDR_START greater than IPADDR_END"; continue fi ipaddr_num=$ipaddr_startnum |