From e2cb7691fe15d142fc1ae8dcb85a526f9db5edf0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Mon, 13 Jul 2009 12:10:23 -0500
Subject: linhes-config: prefix a "c" to network parms to avoid conflicts to
 the ones built into the kernel.

---
 abs/core-testing/LinHES-config/PKGBUILD             |  2 +-
 abs/core-testing/LinHES-config/install_functions.sh | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 8ebf3f8..9486462 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.0
-pkgrel=56
+pkgrel=57
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
 pkgdesc="Install and configure your system"
 depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync python-parted ddcxinfo python-pexpect python-netifaces LinHES-timezone python-iplib)
diff --git a/abs/core-testing/LinHES-config/install_functions.sh b/abs/core-testing/LinHES-config/install_functions.sh
index 94b4375..ea9e61c 100755
--- a/abs/core-testing/LinHES-config/install_functions.sh
+++ b/abs/core-testing/LinHES-config/install_functions.sh
@@ -161,10 +161,10 @@ fi
 
 function rest_of_network () {
     #netmask
-    echo $CMDLINE | grep -q netmask
+    echo $CMDLINE | grep -q cnetmask
     if [ $? -eq 0 ]
     then
-        TEMPVAR=${CMDLINE#*netmask=}
+        TEMPVAR=${CMDLINE#*cnetmask=}
         NETMASK=${TEMPVAR%% *}
         /sbin/ifconfig eth0 $IP netmask $NETMASK
         nm=`/usr/bin/nmconv.py -obits  $NETMASK`
@@ -175,10 +175,10 @@ function rest_of_network () {
         printhl "   Netmask not found"
     fi
     #gateway
-    echo $CMDLINE | grep -q gateway
+    echo $CMDLINE | grep -q cgateway
     if [ $? -eq 0 ]
     then
-        TEMPVAR=${CMDLINE#*gateway=}
+        TEMPVAR=${CMDLINE#*cgateway=}
         GATEWAY=${TEMPVAR%% *}
         /sbin/route add default  gw $GATEWAY
         update_db_settings HostGW${MYTHDEFAULT} "$GATEWAY"
@@ -187,10 +187,10 @@ function rest_of_network () {
     fi
 
     #dns
-    echo $CMDLINE | grep -q dns
+    echo $CMDLINE | grep -q cdns
     if [ $? -eq 0 ]
     then
-        TEMPVAR=${CMDLINE#*dns=}
+        TEMPVAR=${CMDLINE#*cdns=}
         DNS=${TEMPVAR%% *}
         echo "nameserver $DNS" >> /etc/resolv.conf
         update_db_settings HostDNS${MYTHDEFAULT} "$DNS"
@@ -200,10 +200,10 @@ function rest_of_network () {
 }
 
 function init_network {
-    echo $CMDLINE |grep -q netdev
+    echo $CMDLINE |grep -q cnetdev
     if [ $? -eq 0 ]
     then
-        TEMPVAR=${CMDLINE#*netdev=}
+        TEMPVAR=${CMDLINE#*cnetdev=}
         MYTHDEFAULT=${TEMPVAR%% *}
     else
         MYTHDEFAULT="eth0"
@@ -219,7 +219,7 @@ function init_network {
         update_db_settings HostActiveonboot${MYTHDEFAULT} 1
         update_db_settings HostNetDevice ${MYTHDEFAULT}
 
-        TEMPVAR=${CMDLINE#*ip=}
+        TEMPVAR=${CMDLINE#*cip=}
         IP=${TEMPVAR%% *}
         if [ "$IP" == "dhcp" ]
         then
-- 
cgit v0.12