1 files changed, 76 insertions, 46 deletions

diff --git a/noncore/settings/networksettings2/network/network_NNI.cpp b/noncore/settings/networksettings2/network/network_NNI.cpp
index 3e368a2..324c6e2 100644
--- a/noncore/settings/networksettings2/network/network_NNI.cpp
+++ b/noncore/settings/networksettings2/network/network_NNI.cpp
@@ -101,3 +101,3 @@ void ANetwork::commit( void ) {
 
-bool ANetwork::hasDataFor( const QString & S ) {
+bool ANetwork::hasDataForFile( const QString & S ) {
       return S == "interfaces";
@@ -105,49 +105,63 @@ bool ANetwork::hasDataFor( const QString & S ) {
 
-bool ANetwork::generateDataForCommonFile( SystemFile & S, long DevNr ) {
+short ANetwork::generateFile( const QString & ID,
+                             const QString & Path,
+                             QTextStream &TS,
+                             long DevNr 
+                           ) {
+
+    short rvl, rvd ;
     QString NIC = runtime()->device()->netNode()->nodeClass()->genNic( DevNr );
 
-    if( S.name() == "interfaces" ) {
+    rvl = 1;
+    if( ID == "interfaces" ) {
+      Log(("Generate Network for %s\n", ID.latin1() ));
       // we can safely call from here since device item is deeper
       if( Data.UseDHCP ) {
-        S << "iface " 
-          << NIC 
-          << "-c" 
-          << connection()->number() 
-          << "-allowed inet dhcp" 
-          << endl;
-        S << "  up echo \"" 
-          << NIC 
-          << "\" > /tmp/profile-" 
-          << connection()->number() 
-          << ".up" 
-          << endl;
+        TS << "iface " 
+           << NIC 
+           << "-c" 
+           << connection()->number() 
+           << "-allowed inet dhcp" 
+           << endl;
+        TS << "  up echo \"" 
+           << NIC 
+           << "\" > /tmp/profile-" 
+           << connection()->number() 
+           << ".up" 
+           << endl;
         if( Data.SendHostname ) {
-          S << "  hostname "
-            << Data.Hostname  
-            << endl;
+          TS << "  hostname "
+             << Data.Hostname  
+             << endl;
         }
 
-        S << "  down rm -f /tmp/profile-" 
-          << connection()->number() 
-          << ".up"
-          << endl;
+        TS << "  down rm -f /tmp/profile-" 
+           << connection()->number() 
+           << ".up"
+           << endl;
       } else {
-        S << "iface " 
-          << NIC << "-c" 
-          << connection()->number() 
-          << "-allowed inet static" 
-          << endl;
-        S << "  up echo \"" 
-          << NIC 
-          << "\" > /tmp/profile-" 
-          << connection()->number() 
-          << ".up" 
-          << endl;
-        S << "  down rm -f /tmp/profile-" 
-          << connection()->number() 
-          << ".up" 
-          << endl;
-        S << "  address   " << Data.IPAddress << endl;
-        S << "  broadcast " << Data.Broadcast << endl;
-        S << "  netmask   " << Data.NetMask << endl;
+        TS << "iface " 
+           << NIC << "-c" 
+           << connection()->number() 
+           << "-allowed inet static" 
+           << endl;
+        TS << "  up echo \"" 
+           << NIC 
+           << "\" > /tmp/profile-" 
+           << connection()->number() 
+           << ".up" 
+           << endl;
+        TS << "  down rm -f /tmp/profile-" 
+           << connection()->number() 
+           << ".up" 
+           << endl;
+        TS << "  address   " 
+           << Data.IPAddress 
+           << endl;
+        TS << "  broadcast " 
+           << Data.Broadcast 
+           << endl;
+        TS << "  netmask   " 
+           << Data.NetMask 
+           << endl;
 
@@ -163,3 +177,5 @@ bool ANetwork::generateDataForCommonFile( SystemFile & S, long DevNr ) {
               arg( ipal[3].toShort() & nmal[3].toShort() );
-          S << "  network   " << NW << endl;
+          TS << "  network   " 
+             << NW 
+             << endl;
         }
@@ -169,3 +185,5 @@ bool ANetwork::generateDataForCommonFile( SystemFile & S, long DevNr ) {
             ++it ) {
-        S << "  pre-up    " << (*it) << endl;
+        TS << "  pre-up    " 
+           << (*it) 
+           << endl;
       }
@@ -174,3 +192,5 @@ bool ANetwork::generateDataForCommonFile( SystemFile & S, long DevNr ) {
             ++it ) {
-        S << "  up        " << (*it) << endl;
+        TS << "  up        " 
+           << (*it) 
+           << endl;
       }
@@ -179,3 +199,5 @@ bool ANetwork::generateDataForCommonFile( SystemFile & S, long DevNr ) {
             ++it ) {
-        S << "  down      " << (*it) << endl;
+        TS << "  down      " 
+           << (*it) 
+           << endl;
       }
@@ -184,6 +206,14 @@ bool ANetwork::generateDataForCommonFile( SystemFile & S, long DevNr ) {
             ++it ) {
-        S << "  post-down " << (*it) << endl;
+        TS << "  post-down " 
+           << (*it) 
+           << endl;
       }
+      rvl = 0;
     }
-    return 0;
+
+    // embed other info in it
+    rvd = connection()->getToplevel()->generateFileEmbedded( ID, Path, TS, DevNr );
+
+    return (rvd == 2 || rvl == 2 ) ? 2 :
+           (rvd == 0 || rvl == 0 ) ? 0 : 1;
 }