From 246f59248128f19c333ab44ad5398ea333a4f838 Mon Sep 17 00:00:00 2001
From: "Michael K. Johnson" <johnsonm@redhat.com>
Date: Tue, 10 Nov 1998 16:26:05 +0000
Subject: linuxconf ipalias fix; work with both old and new linuxconf

---
 initscripts.spec                       |  5 ++++-
 sysconfig/network-scripts/ifup-aliases | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/initscripts.spec b/initscripts.spec
index fe6fb275..aa6ec4f6 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
 Summary: inittab and /etc/rc.d scripts
 Name: initscripts
-%define version 3.78
+%define version 3.79
 Version: %{version}
 Copyright: GPL
 Group: Base
@@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc sysconfig.txt
 
 %changelog
+* Tue Nov 10 1998 Michael Johnson <johnsonm@redhat.com>
+- handle new linuxconf output for ipaliases
+
 * Mon Oct 15 1998 Erik Troan <ewt@redhat.com>
 - fixed raid start stuff
 - added raidstop to halt
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
index 39233819..8021a3dc 100755
--- a/sysconfig/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases
@@ -12,10 +12,16 @@ if [ -x /bin/linuxconf ] ; then
     # add	<device>	<ip>
     # del	<device>
     # reload	<number_of_aliases>
-    linuxconf --hint ipalias $1 | while read verb arg1 arg2 ; do
+    linuxconf --hint ipalias $1 | while read verb arg1 arg2 arg3 arg4; do
 	case $verb in
 	  add)
-		/sbin/ifconfig $arg1 $arg2
+		if [ -z "$arg3" ] ; then
+		    # old linuxconf
+		    /sbin/ifconfig $arg1 $arg2
+		else
+		    # new linuxconf
+		    /sbin/ifconfig $arg1 $arg2 netmask $arg3 broadcast $arg4
+		fi
 		/sbin/route add $arg2 $arg1
 		;;
 	  del)
-- 
cgit v1.2.1