From 9dec8afc7fab4d52b6031491506af043d32abfb1 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 18 May 2011 12:47:06 -0400
Subject: Override NETMASK from PREFIX where specified (#705367,
 <mpoole@redhat.com>)

---
 sysconfig/network-scripts/network-functions | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 91181a16..c84bb08d 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -162,6 +162,11 @@ expand_config ()
         netmask[$i]=$(eval echo '$'NETMASK$idx)
         broadcast[$i]=$(eval echo '$'BROADCAST$idx)
 
+        if [ "${prefix[$i]}x" != "x" ]; then
+            val=$(/bin/ipcalc --netmask "${ipaddr[$i]}/${prefix[$i]}")
+            netmask[$i]=${val##NETMASK=}
+        fi
+
         if [ "${netmask[$i]}x" = "x" ]; then
             val=$(/bin/ipcalc --netmask "${ipaddr[$i]}")
             netmask[$i]=${val##NETMASK=}
-- 
cgit v1.2.1