Mailinglist Archive: yast-commit (870 mails)

[mzugec@xxxxxxxxxxxxxxxx]

Author: mzugec
Date: Tue Jul  1 17:45:00 2008
New Revision: 48734

URL: http://svn.opensuse.org/viewcvs/yast?rev=48734&view=rev
Log:
new function is NetworkService::Networkv6Running()
rewrite IP/PREFIXLEN for aliases in NetworkInterfaces


Modified:
    trunk/yast2/VERSION
    trunk/yast2/library/network/src/NetworkInterfaces.ycp
    trunk/yast2/library/network/src/NetworkService.ycp
    trunk/yast2/package/yast2.changes

Modified: trunk/yast2/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=48734&r1=48733&r2=48734&view=diff
==============================================================================
--- trunk/yast2/VERSION (original)
+++ trunk/yast2/VERSION Tue Jul  1 17:45:00 2008
@@ -1 +1 @@
-2.17.4
+2.17.5

Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkInterfaces.ycp?rev=48734&r1=48733&r2=48734&view=diff
==============================================================================
--- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original)
+++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Tue Jul  1 17:45:00 
2008
@@ -740,13 +740,17 @@
                        // better here. Actually it does not work because
                        // the edit dialog nukes LABEL :-(
                        boolean seen_label = false;
-
-                       if (size(amap["IPADDR"]:"")>0 && 
size(amap["NETMASK"]:"")>0){
-                        amap["IPADDR"] = sformat("%1/%2", amap["IPADDR"]:"", 
Netmask::ToBits(amap["NETMASK"]:""));
-                        amap=remove(amap, "NETMASK");
-                        //TODO : delete NETMASK from config file
-                       }
-
+               if (size(amap["IPADDR"]:"")>0 && size(amap["NETMASK"]:"")>0){
+                amap["IPADDR"] = sformat("%1/%2", amap["IPADDR"]:"", 
Netmask::ToBits(amap["NETMASK"]:""));
+                amap=remove(amap, "NETMASK");
+                //TODO : delete NETMASK from config file
+               } else {
+                if (size(amap["IPADDR"]:"")>0 && size(amap["PREFIXLEN"]:"")>0){
+                 amap["IPADDR"] = sformat("%1/%2", amap["IPADDR"]:"", 
amap["PREFIXLEN"]:"");
+                 amap=remove(amap, "PREFIXLEN");
+                //TODO : delete PREFIXLEN from config file
+                }
+               }
 
                        maplist(string ak, string av, amap, {
                            string akk = ak + "_" + anum;

Modified: trunk/yast2/library/network/src/NetworkService.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkService.ycp?rev=48734&r1=48733&r2=48734&view=diff
==============================================================================
--- trunk/yast2/library/network/src/NetworkService.ycp (original)
+++ trunk/yast2/library/network/src/NetworkService.ycp Tue Jul  1 17:45:00 2008
@@ -130,9 +130,22 @@
 }
 
 
+// test for IPv4
 global boolean isNetworkRunning(){
  integer net = (integer)SCR::Execute(.target.bash,
-                "ip addr|grep -v '127.0.0.1\\|inet6'|grep -c inet");
+                "ip addr|grep -v '127.0.0\\|inet6'|grep -c inet");
+ if (net==0) {
+  y2milestone ("Network is running ...");
+  return true;
+ } else {
+        y2milestone("Network is not running ...");
+        return false;
+        }
+}
+// test for IPv6
+global boolean isNetworkv6Running(){
+ integer net = (integer)SCR::Execute(.target.bash,
+                "ip addr|grep -v 'inet6 ::1\\|inet6 fe80'|grep -c inet6");
  if (net==0) {
   y2milestone ("Network is running ...");
   return true;
@@ -140,9 +153,7 @@
         y2milestone("Network is not running ...");
         return false;
         }
-
 }
-
 
 /**
  * If there is network running, return true.

Modified: trunk/yast2/package/yast2.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=48734&r1=48733&r2=48734&view=diff
==============================================================================
--- trunk/yast2/package/yast2.changes (original)
+++ trunk/yast2/package/yast2.changes Tue Jul  1 17:45:00 2008
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue Jul  1 17:43:02 CEST 2008 - mzugec@xxxxxxx
+
+- new function is NetworkService::Networkv6Running()
+- rewrite IP/PREFIXLEN for aliases in NetworkInterfaces
+- 2.17.5 
+
+-------------------------------------------------------------------
 Fri Jun 27 10:53:23 CEST 2008 - lslezak@xxxxxxx
 
 - adapted to the new patch messages and patch scripts callbacks

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx