Error in generation of files

53 files changed, 564 insertions, 157 deletions

diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h
index e65b378..347da0c 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h
@@ -15,2 +15,6 @@ public :
         { QString S; return S.sprintf( "bnep%ld", nr ); }
+
+      virtual AsDevice * asDevice( void ) 
+        { return (AsDevice *)this; }
+
       virtual AsDevice * device( void ) 
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
index 87116e2..6a7902a 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h
@@ -11,2 +11,5 @@ public :
 
+      virtual AsLine * asLine( void ) 
+        { return (AsLine *)this; }
+
 protected :
diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
index 91be153..47272c4 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
@@ -51,4 +51,4 @@ bool BluetoothBNEPNetNode::generateProperFilesFor(
 
-bool BluetoothBNEPNetNode::hasDataFor( const QString & ) {
-      return 0;
+bool BluetoothBNEPNetNode::hasDataFor( const QString & S, bool DS ) {
+      return DS && S == "interfaces";
 }
@@ -62,2 +62,9 @@ bool BluetoothBNEPNetNode::generateDataForCommonFile(
 
+bool BluetoothBNEPNetNode::generateDeviceDataForCommonFile( 
+                                SystemFile & , 
+                                long ,
+                                ANetNodeInstance * ) {
+      return 1;
+}
+
 //
@@ -103,3 +110,3 @@ bool BluetoothRFCOMMNetNode::generateProperFilesFor(
 
-bool BluetoothRFCOMMNetNode::hasDataFor( const QString & ) {
+bool BluetoothRFCOMMNetNode::hasDataFor( const QString &, bool  ) {
       return 0;
diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h
index 705201c..d72b0d4 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h
@@ -30,5 +30,7 @@ public:
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool DS );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
 
@@ -61,5 +63,7 @@ public:
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool  );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long, ANetNodeInstance * NNI );
 
diff --git a/noncore/settings/networksettings2/cable/cable_NN.cpp b/noncore/settings/networksettings2/cable/cable_NN.cpp
index 756903e..6f62772 100644
--- a/noncore/settings/networksettings2/cable/cable_NN.cpp
+++ b/noncore/settings/networksettings2/cable/cable_NN.cpp
@@ -43,3 +43,3 @@ bool CableNetNode::generateProperFilesFor(
 
-bool CableNetNode::hasDataFor( const QString & ) {
+bool CableNetNode::hasDataFor( const QString &, bool  ) {
       return 0;
@@ -54,2 +54,9 @@ bool CableNetNode::generateDataForCommonFile(
 
+bool CableNetNode::generateDeviceDataForCommonFile( 
+                                SystemFile & , 
+                                long ,
+                                ANetNodeInstance * ) {
+      return 1;
+}
+
 extern "C" {
diff --git a/noncore/settings/networksettings2/cable/cable_NN.h b/noncore/settings/networksettings2/cable/cable_NN.h
index da99c1c..3875af6 100644
--- a/noncore/settings/networksettings2/cable/cable_NN.h
+++ b/noncore/settings/networksettings2/cable/cable_NN.h
@@ -30,5 +30,7 @@ public:
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool DS );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
 
diff --git a/noncore/settings/networksettings2/cable/cablerun.h b/noncore/settings/networksettings2/cable/cablerun.h
index 36ee640..7b341c4 100644
--- a/noncore/settings/networksettings2/cable/cablerun.h
+++ b/noncore/settings/networksettings2/cable/cablerun.h
@@ -11,2 +11,5 @@ public :
 
+      virtual AsLine * asLine( void ) 
+        { return (AsLine *)this; }
+
 protected :
diff --git a/noncore/settings/networksettings2/irda/irda_NN.cpp b/noncore/settings/networksettings2/irda/irda_NN.cpp
index 3b9c938..4347191 100644
--- a/noncore/settings/networksettings2/irda/irda_NN.cpp
+++ b/noncore/settings/networksettings2/irda/irda_NN.cpp
@@ -43,3 +43,3 @@ bool IRDANetNode::generateProperFilesFor(
 
-bool IRDANetNode::hasDataFor( const QString & ) {
+bool IRDANetNode::hasDataFor( const QString &, bool  ) {
       return 0;
@@ -54,2 +54,9 @@ bool IRDANetNode::generateDataForCommonFile(
 
+bool IRDANetNode::generateDeviceDataForCommonFile( 
+                                SystemFile & , 
+                                long ,
+                                ANetNodeInstance * ) {
+      return 1;
+}
+
 extern "C" {
diff --git a/noncore/settings/networksettings2/irda/irda_NN.h b/noncore/settings/networksettings2/irda/irda_NN.h
index 6574c17..a772f69 100644
--- a/noncore/settings/networksettings2/irda/irda_NN.h
+++ b/noncore/settings/networksettings2/irda/irda_NN.h
@@ -30,5 +30,7 @@ public:
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool DS );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
 
diff --git a/noncore/settings/networksettings2/irda/irdarun.h b/noncore/settings/networksettings2/irda/irdarun.h
index adc9c24..d9fe5e8 100644
--- a/noncore/settings/networksettings2/irda/irdarun.h
+++ b/noncore/settings/networksettings2/irda/irdarun.h
@@ -11,2 +11,5 @@ public :
 
+      virtual AsLine * asLine( void ) 
+        { return (AsLine *)this; }
+
 protected :
diff --git a/noncore/settings/networksettings2/lancard/lancard_NN.cpp b/noncore/settings/networksettings2/lancard/lancard_NN.cpp
index a45496d..7d36918 100644
--- a/noncore/settings/networksettings2/lancard/lancard_NN.cpp
+++ b/noncore/settings/networksettings2/lancard/lancard_NN.cpp
@@ -44,4 +44,4 @@ bool LanCardNetNode::generateProperFilesFor(
 
-bool LanCardNetNode::hasDataFor( const QString & ) {
-      return 0;
+bool LanCardNetNode::hasDataFor( const QString & S, bool DS ) {
+      return DS && S == "interfaces";
 }
@@ -55,2 +55,9 @@ bool LanCardNetNode::generateDataForCommonFile(
 
+bool LanCardNetNode::generateDeviceDataForCommonFile( 
+                                SystemFile & S , 
+                                long DevNr ,
+                                ANetNodeInstance * NNI ) {
+      return ((ALanCard *)NNI)->generateDeviceDataForCommonFile(S, DevNr);
+}
+
 extern "C" {
diff --git a/noncore/settings/networksettings2/lancard/lancard_NN.h b/noncore/settings/networksettings2/lancard/lancard_NN.h
index 71b49d0..9690c76 100644
--- a/noncore/settings/networksettings2/lancard/lancard_NN.h
+++ b/noncore/settings/networksettings2/lancard/lancard_NN.h
@@ -30,5 +30,7 @@ public:
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool DS );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
 
diff --git a/noncore/settings/networksettings2/lancard/lancard_NNI.cpp b/noncore/settings/networksettings2/lancard/lancard_NNI.cpp
index 9595e2e..a6401db 100644
--- a/noncore/settings/networksettings2/lancard/lancard_NNI.cpp
+++ b/noncore/settings/networksettings2/lancard/lancard_NNI.cpp
@@ -44 +44,15 @@ void ALanCard::commit( void ) {
 }
+
+bool ALanCard::generateDeviceDataForCommonFile( SystemFile & S, long DevNr ) {
+    AsDevice * Dev = runtime()->device();
+    QString NIC = Dev->genNic( DevNr );
+
+    if( S.name() == "interfaces" ) {
+      // generate mapping stanza for this interface
+      S << "# check if " << NIC << " can be brought UP" << endl;
+      S << "mapping " << NIC << endl;
+      S << "  script networksettings2-request" << endl << endl;
+    }
+    return 0;
+}
+
diff --git a/noncore/settings/networksettings2/lancard/lancard_NNI.h b/noncore/settings/networksettings2/lancard/lancard_NNI.h
index 8fc8868..16f5f56 100644
--- a/noncore/settings/networksettings2/lancard/lancard_NNI.h
+++ b/noncore/settings/networksettings2/lancard/lancard_NNI.h
@@ -29,2 +29,4 @@ public :
 
+      bool generateDeviceDataForCommonFile( SystemFile & S, long DevNr );
+
 protected :
diff --git a/noncore/settings/networksettings2/lancard/lancardrun.cpp b/noncore/settings/networksettings2/lancard/lancardrun.cpp
index b3b592b..951756d 100644
--- a/noncore/settings/networksettings2/lancard/lancardrun.cpp
+++ b/noncore/settings/networksettings2/lancard/lancardrun.cpp
@@ -38,3 +38,12 @@ void LanCardRun::detectState( NodeCollection * NC ) {
 
-    // we are certainly not UP
+    if( ( Run = assignedInterface() ) ) {
+      // we already have an interface assigned -> still present ?
+      if( ! Run->IsUp ) {
+        // usb is still free -> keep assignment
+        NC->setCurrentState( Available );
+        return;
+      } // else interface is up but NOT us -> some other profile
+    }
+
+    // nothing (valid) assigned to us
     assignInterface( 0 );
@@ -89,4 +98,3 @@ bool LanCardRun::setState( NodeCollection * NC, Action_t A ) {
             return 0;
-        }
-        if( NC->currentState() != Available ) {
+        } else if( NC->currentState() != Available ) {
           return 1;
diff --git a/noncore/settings/networksettings2/lancard/lancardrun.h b/noncore/settings/networksettings2/lancard/lancardrun.h
index 5f004e0..8dbd1b1 100644
--- a/noncore/settings/networksettings2/lancard/lancardrun.h
+++ b/noncore/settings/networksettings2/lancard/lancardrun.h
@@ -20,4 +20,8 @@ public :
         { QString S; return S.sprintf( "eth%ld", nr ); }
+
       virtual AsDevice * device( void ) 
-        { return asDevice(); }
+        { return (AsDevice *)this; }
+
+      virtual AsDevice * asDevice( void ) 
+        { return (AsDevice *)this; }
 
diff --git a/noncore/settings/networksettings2/modem/modem_NN.cpp b/noncore/settings/networksettings2/modem/modem_NN.cpp
index 48e1ad8..2807963 100644
--- a/noncore/settings/networksettings2/modem/modem_NN.cpp
+++ b/noncore/settings/networksettings2/modem/modem_NN.cpp
@@ -44,3 +44,3 @@ bool ModemNetNode::generateProperFilesFor(
 
-bool ModemNetNode::hasDataFor( const QString & ) {
+bool ModemNetNode::hasDataFor( const QString &, bool ) {
       return 0;
@@ -55,2 +55,9 @@ bool ModemNetNode::generateDataForCommonFile(
 
+bool ModemNetNode::generateDeviceDataForCommonFile( 
+                                SystemFile & , 
+                                long ,
+                                ANetNodeInstance * ) {
+      return 1;
+}
+
 extern "C" {
diff --git a/noncore/settings/networksettings2/modem/modem_NN.h b/noncore/settings/networksettings2/modem/modem_NN.h
index 5eceed2..bd921c6 100644
--- a/noncore/settings/networksettings2/modem/modem_NN.h
+++ b/noncore/settings/networksettings2/modem/modem_NN.h
@@ -30,5 +30,7 @@ public:
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool DS );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
 
diff --git a/noncore/settings/networksettings2/modem/modemrun.h b/noncore/settings/networksettings2/modem/modemrun.h
index 719ab2f..6d1662b 100644
--- a/noncore/settings/networksettings2/modem/modemrun.h
+++ b/noncore/settings/networksettings2/modem/modemrun.h
@@ -11,2 +11,5 @@ public :
 
+      virtual AsLine * asLine( void ) 
+        { return (AsLine *)this; }
+
 protected :
diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp
index bb371ad..a6b15c6 100644
--- a/noncore/settings/networksettings2/network/network_NN.cpp
+++ b/noncore/settings/networksettings2/network/network_NN.cpp
@@ -45,4 +45,4 @@ bool NetworkNetNode::generateProperFilesFor(
 
-bool NetworkNetNode::hasDataFor( const QString & S ) {
-      if( S == "interfaces" ) {
+bool NetworkNetNode::hasDataFor( const QString & S, bool DS ) {
+      if( ! DS && S == "interfaces" ) {
         return 1;
@@ -59,2 +59,9 @@ bool NetworkNetNode::generateDataForCommonFile(
 
+bool NetworkNetNode::generateDeviceDataForCommonFile( 
+                                SystemFile & , 
+                                long ,
+                                ANetNodeInstance * ) {
+      return 1;
+}
+
 extern "C" {
diff --git a/noncore/settings/networksettings2/network/network_NN.h b/noncore/settings/networksettings2/network/network_NN.h
index 220e00f..62a3f10 100644
--- a/noncore/settings/networksettings2/network/network_NN.h
+++ b/noncore/settings/networksettings2/network/network_NN.h
@@ -30,5 +30,7 @@ public:
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool DS );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
 
diff --git a/noncore/settings/networksettings2/network/network_NNI.cpp b/noncore/settings/networksettings2/network/network_NNI.cpp
index 7130764..eac2d66 100644
--- a/noncore/settings/networksettings2/network/network_NNI.cpp
+++ b/noncore/settings/networksettings2/network/network_NNI.cpp
@@ -106,7 +106,2 @@ bool ANetwork::generateDataForCommonFile( SystemFile & S, long DevNr ) {
     if( S.name() == "interfaces" ) {
-      // generate mapping stanza for this interface
-      S << "# check if " << NIC << " can be brought UP" << endl;
-      S << "mapping " << NIC << endl;
-      S << "  script networksettings2-request" << endl << endl;
-
       // we can safely call from here since device item is deeper
diff --git a/noncore/settings/networksettings2/network/networkedit.cpp b/noncore/settings/networksettings2/network/networkedit.cpp
index b17d745..182213b 100644
--- a/noncore/settings/networksettings2/network/networkedit.cpp
+++ b/noncore/settings/networksettings2/network/networkedit.cpp
@@ -54,9 +54,9 @@ QString NetworkEdit::acceptable( void ) {
       return tr("Broadcast address not valid");
-    if( Gateway_LE->text().isEmpty() &&
+    if( Gateway_LE->text().isEmpty() ||
         ! validIP( Gateway_LE->text() ) )
       return tr("Gateway address not valid");
-    if( DNS1_LE->text().isEmpty() &&
+    if( ! DNS1_LE->text().isEmpty() &&
         ! validIP( DNS1_LE->text() ) )
       return tr("DNS1 address not valid");
-    if( DNS2_LE->text().isEmpty() &&
+    if( ! DNS2_LE->text().isEmpty() &&
         ! validIP( DNS2_LE->text() ) )
diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp
index 8deca14..f34fdbf 100644
--- a/noncore/settings/networksettings2/network/networkrun.cpp
+++ b/noncore/settings/networksettings2/network/networkrun.cpp
@@ -28,5 +28,6 @@ bool NetworkRun::setState( NodeCollection * NC, Action_t A ) {
         QString S;
-        S.sprintf( "ifup %s", II->Name.latin1() );
+        S.sprintf( "ifup %s=%s-c%d-allowed", 
+            II->Name.latin1(), II->Name.latin1(),
+            connection()->number() );
         NSResources->system().execute( S );
-        NC->setCurrentState( IsUp );
       }
@@ -36,5 +37,6 @@ bool NetworkRun::setState( NodeCollection * NC, Action_t A ) {
         QString S;
-        S.sprintf( "ifdown %s", II->Name.latin1() );
+        S.sprintf( "ifdown %s=%s-c%d-allowed", 
+            II->Name.latin1(), II->Name.latin1(),
+            connection()->number() );
         NSResources->system().execute( S );
-        NC->setCurrentState( Available );
       }
diff --git a/noncore/settings/networksettings2/network/networkrun.h b/noncore/settings/networksettings2/network/networkrun.h
index f3d840e..fa16365 100644
--- a/noncore/settings/networksettings2/network/networkrun.h
+++ b/noncore/settings/networksettings2/network/networkrun.h
@@ -11,2 +11,5 @@ public :
 
+      virtual AsConnection * asConnection( void ) 
+        { return (AsConnection *)this; }
+
 protected :
diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp
index e1110e2..c3e6572 100644
--- a/noncore/settings/networksettings2/networksettings.cpp
+++ b/noncore/settings/networksettings2/networksettings.cpp
@@ -170,32 +170,50 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) {
     UpdateTimer->stop();
-    if( EC.exec() == QDialog::Accepted ) {
-      // toplevel item -> store
-      NodeCollection * NC = EC.connection();
-      if( NC->isModified() ) {
-        setModified( 1 );
+    // we need to retry
+    while( 1 ) {
+      if( EC.exec() == QDialog::Accepted ) {
+        // toplevel item -> store
+        NodeCollection * NC = EC.connection();
+        if( NC->isModified() ) {
+          setModified( 1 );
+          if( LBI ) {
+            if( NC->name() != OldName ) {
+              // find if new name is free
+              NodeCollection * LCN = NSResources->findConnection(
+                    NC->name() );
+              if( LCN ) {
+                QMessageBox::warning(
+                  0, 
+                  tr( "Generating system configuration" ),
+                  tr( "Name %1 already exists" ).arg(NC->name())
+                );
+                continue; // restart exec
+              } // else new name
+              // new name -> remove item
+              NSResources->removeConnection( OldName );
+              NSResources->addConnection( NC );
+            } // else not changed
+
+            // must add it here since change will trigger event
+            Profiles_LB->changeItem( NC->devicePixmap(),
+                                     NC->name(),
+                                     Profiles_LB->index( LBI )
+                                   );
+          } else {
+            // new item
+            int ci = Profiles_LB->count();
+            NSResources->addConnection( NC );
+            NC->setNumber( NC->maxConnectionNumber()+1 );
+            Profiles_LB->insertItem( NC->devicePixmap(), NC->name() );
+            Profiles_LB->setSelected( ci, TRUE );
+          }
+          updateProfileState( LBI );
+        }
+      } else {
+        // cancelled : reset connection 
         if( LBI ) {
-          // new name -> remove item
-          NSResources->removeConnection( OldName );
-          // must add it here since change will trigger event
-          NSResources->addConnection( NC );
-          Profiles_LB->changeItem( NC->devicePixmap(),
-                                   NC->name(),
-                                   Profiles_LB->index( LBI )
-                                 );
-        } else {
-          // new item
-          int ci = Profiles_LB->count();
-          NSResources->addConnection( NC );
-          NC->setNumber( NC->maxConnectionNumber()+1 );
-          Profiles_LB->insertItem( NC->devicePixmap(), NC->name() );
-          Profiles_LB->setSelected( ci, TRUE );
+          NodeCollection * NC = NSResources->findConnection( LBI->text() );
+          NC->reassign();
         }
-        updateProfileState( LBI );
-      }
-    } else {
-      // cancelled : reset connection 
-      if( LBI ) {
-        NodeCollection * NC = NSResources->findConnection( LBI->text() );
-        NC->reassign();
       }
+      break;
     }
@@ -335,11 +353,6 @@ void NetworkSettings::SLOT_On( void ) {
         break;
-      case Available :
-        // deactivate
+      case Available : // deactivate
+      case IsUp : // deactivate (will also bring down if needed)
         rv = NC->setState( Deactivate );
         break;
-      case IsUp :
-        // bring down and deactivate
-        rv = ( NC->setState( Down ) &&
-               NC->setState( Deactivate ) );
-        break;
       default :
@@ -368,3 +381,3 @@ void NetworkSettings::SLOT_Connect( void ) {
 
-    bool rv;
+    bool rv = 1 ;
     switch( NC->state() ) {
@@ -385,3 +398,3 @@ void NetworkSettings::SLOT_Connect( void ) {
         // others no change
-        return;
+        break;
     } 
@@ -393,3 +406,2 @@ void NetworkSettings::SLOT_Connect( void ) {
           tr( "Cannot enable profile" ) );
-      return;
     }
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.h b/noncore/settings/networksettings2/networksettings2/netnode.h
index 56333c5..f4a5e30 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.h
+++ b/noncore/settings/networksettings2/networksettings2/netnode.h
@@ -97,4 +97,4 @@ public:
   // with name S
-  virtual bool hasDataFor( const QString & S ) = 0;
-  // generate data specific for the system file S
+  virtual bool hasDataFor( const QString & S, bool DeviceSpecific ) = 0;
+  // generate data specific for a profile and for the system file S
   // called only IF data was needed
@@ -102,2 +102,6 @@ public:
       SystemFile & SF, long DevNr, ANetNodeInstance * NNI ) = 0;
+  // generate data specific for the device for the system file S
+  // called only IF data was needed
+  virtual bool generateDeviceDataForCommonFile( 
+      SystemFile & SF, long DevNr, ANetNodeInstance * NNI ) = 0;
 
@@ -217,11 +221,11 @@ public :
 
-      // downcast
+      // downcast implemented by specify runtime classes
       AsDevice * asDevice( void )
-        { return (AsDevice *)this; }
+        { return 0; }
       AsConnection * asConnection( void )
-        { return (AsConnection *)this; }
+        { return 0; }
       AsLine * asLine( void )
-        { return (AsLine *)this; }
+        { return 0; }
       AsFullSetup * asFullSetup( void )
-        { return (AsFullSetup *)this; }
+        { return 0; }
 
@@ -386,3 +390,3 @@ public:
     { return 0; }
-  virtual bool hasDataFor( const QString & )
+  virtual bool hasDataFor( const QString &, bool DS )
     { return 0; }
@@ -391,2 +395,5 @@ public:
     {return 1; }
+  virtual bool generateDeviceDataForCommonFile( 
+      SystemFile & , long , ANetNodeInstance * )
+    {return 1; }
 
diff --git a/noncore/settings/networksettings2/networksettings2/system.cpp b/noncore/settings/networksettings2/networksettings2/system.cpp
index 85dcd7d..a68f3c0 100644
--- a/noncore/settings/networksettings2/networksettings2/system.cpp
+++ b/noncore/settings/networksettings2/networksettings2/system.cpp
@@ -40,2 +40,3 @@ int System::execute( const QString & S ) {
     QString MyS = S;
+    char * usr = getenv("USER");
     int rv;
@@ -46,4 +47,4 @@ int System::execute( const QString & S ) {
     }
-    if( getenv("USER") != "root" ) {
-      // use SUDO
+    if( usr == 0 || strcmp( usr, "root" ) ) {
+      // unknown or non-root user -> use SUDO
       MyS.prepend( "sudo " );
diff --git a/noncore/settings/networksettings2/networksettings2/systemfile.cpp b/noncore/settings/networksettings2/networksettings2/systemfile.cpp
index 7249976..394ff52 100644
--- a/noncore/settings/networksettings2/networksettings2/systemfile.cpp
+++ b/noncore/settings/networksettings2/networksettings2/systemfile.cpp
@@ -32,3 +32,5 @@ SystemFile::SystemFile( const QString & N, const QString & P ){
               hasPreNodeSection = 
-              hasPostNodeSection = 0;
+              hasPostNodeSection = 
+              hasPreDeviceSection = 
+              hasPostDeviceSection = 0;
             return;
@@ -50,2 +52,8 @@ SystemFile::SystemFile( const QString & N, const QString & P ){
         hasPostNodeSection = ( FI.exists() && FI.isReadable() );
+        S = TemplDir + Name + "/predevicesection";
+        FI.setFile( S );
+        hasPreDeviceSection = ( FI.exists() && FI.isReadable() );
+        S = TemplDir + Name + "/postdevicesection";
+        FI.setFile( S );
+        hasPostDeviceSection = ( FI.exists() && FI.isReadable() );
       }
@@ -110,3 +118,3 @@ bool SystemFile::preNodeSection( ANetNodeInstance * NNI, long ) {
       if( hasPreNodeSection ) {
-        QFile Fl( TemplDir + Name + "/prenodesectoin" );
+        QFile Fl( TemplDir + Name + "/prenodesection" );
         if( ! Fl.open( IO_ReadOnly ) )
@@ -128,3 +136,3 @@ bool SystemFile::postNodeSection( ANetNodeInstance * NNI, long DevNr ) {
       if( hasPostNodeSection ) {
-        QFile Fl( TemplDir + Name + "/postnodesectoin" );
+        QFile Fl( TemplDir + Name + "/postnodesection" );
         if( ! Fl.open( IO_ReadOnly ) )
@@ -144 +152,36 @@ bool SystemFile::postNodeSection( ANetNodeInstance * NNI, long DevNr ) {
 
+bool SystemFile::preDeviceSection( ANetNodeInstance * NNI, long ) {
+      if( hasPreDeviceSection ) {
+        QFile Fl( TemplDir + Name + "/predevicesection" );
+        if( ! Fl.open( IO_ReadOnly ) )
+          return 1; // error
+        QTextStream TX( &Fl );
+        QString Out;
+        QString S = TX.readLine();
+        while( ! TX.eof() ) {
+          Out = S.
+              arg(NNI->netNode()->nodeName());
+          (*this) << Out << endl;
+          S = TX.readLine();
+        }
+      }
+      return 0;
+}
+
+bool SystemFile::postDeviceSection( ANetNodeInstance * NNI, long DevNr ) {
+      if( hasPostDeviceSection ) {
+        QFile Fl( TemplDir + Name + "/postdevicesection" );
+        if( ! Fl.open( IO_ReadOnly ) )
+          return 1; // error
+        QTextStream TX( &Fl );
+        QString Out;
+        QString S = TX.readLine();
+        while( ! TX.eof() ) {
+          Out = S.
+              arg(NNI->nodeName());
+          (*this) << Out << endl;
+          S = TX.readLine();
+        }
+      }
+      return 0;
+}
diff --git a/noncore/settings/networksettings2/networksettings2/systemfile.h b/noncore/settings/networksettings2/networksettings2/systemfile.h
index 8b6bcb9..35e0dfc 100644
--- a/noncore/settings/networksettings2/networksettings2/systemfile.h
+++ b/noncore/settings/networksettings2/networksettings2/systemfile.h
@@ -26,2 +26,4 @@ public :
     bool postNodeSection( ANetNodeInstance * NNI, long DevNr );
+    bool preDeviceSection( ANetNodeInstance * NNI, long DevNr );
+    bool postDeviceSection( ANetNodeInstance * NNI, long DevNr );
 
@@ -33,5 +35,7 @@ private :
     bool hasPreSection;
-    bool hasPreNodeSection;
     bool hasPostSection;
+    bool hasPreNodeSection;
     bool hasPostNodeSection;
+    bool hasPreDeviceSection;
+    bool hasPostDeviceSection;
 
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp
index 3f5e958..6541596 100644
--- a/noncore/settings/networksettings2/nsdata.cpp
+++ b/noncore/settings/networksettings2/nsdata.cpp
@@ -190,2 +190,3 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) {
       SystemFile * SF;
+      AsDevice * CurDev;
       bool needToRegenerate = ForceIt;
@@ -216,3 +217,5 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) {
                 NNI = cncit.current();
-                if( NNI->netNode()->hasDataFor( SF->name() ) &&
+                if( ( NNI->netNode()->hasDataFor( SF->name(), 1 ) ||
+                      NNI->netNode()->hasDataFor( SF->name(), 0 ) 
+                    ) &&
                     NNI->isModified() ) {
@@ -243,3 +246,2 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) {
       { Name2Instance_t & NNIs = NSResources->netNodeInstances();
-        ANetNodeInstance * NNI;
 
@@ -265,3 +267,3 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) {
       //
-      // generate system files
+      // generate all system files
       //
@@ -272,5 +274,2 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) {
 
-        // 
-        // regenerate current file
-        // 
         printf( "Generating %s\n", SF->name().latin1() );
@@ -280,2 +279,3 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) {
 
+          // global presection for this system file
           if( SF->preSection() ) {
@@ -287,30 +287,101 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) {
 
-          for( QDictIterator<NodeCollection> ncit(M);
-               ncit.current();
-               ++ncit ) {
-            NC = ncit.current();
-
-            // get the netnode that serves as the device for this
-            // connection
-            AsDevice * Dev = NC->device();
+          // find all netnodes and figure out if
+          // for that node there are instances 
+          for( QDictIterator<NetNode_t> nnit(
+                      NSResources->netNodes() );
+               nnit.current();
+               ++nnit ) {
+            ANetNode * NN;
+
+            NN = nnit.current()->NetNode;
+
+              // are there instances ? 
+              NNI = 0;
+              for( QDictIterator<ANetNodeInstance> nniit(
+                          NSResources->netNodeInstances() );
+                   nniit.current();
+                   ++nniit ) {
+                if( nniit.current()->netNode() == NN ) { 
+                  NNI = nniit.current();
+                  break;
+                }
+              }
 
-            // generate 'entry' for every possible device this profile handles
+              if( ! NNI )
+                // no instances
+                continue;
+
+            // has this node data for this system file ?
+            if( (CurDev = NNI->runtime()->asDevice() ) ) {
+              // generate start for this nodetype for all possible devices of this type
+              for( int i = 0; i < CurDev->count(); i ++ ) {
+                if( SF->preDeviceSection( NNI, i ) ) {
+                  S = qApp->translate( "NetworkSettings", 
+                      "<p>Error in preDeviceSection for file %1 and node %2</p>" ).
+                      arg( SF->name() ).
+                      arg( NN->nodeName() );
+                  return S;
+                }
 
-            for( QListIterator<ANetNodeInstance> cncit(*NC); 
-                 cncit.current();
-                 ++cncit ) {
-              NNI = cncit.current();
-              for( int i = 0; i < Dev->count(); i ++ ) {
-                if( NNI->netNode()->hasDataFor( SF->name() ) ) {
-                  if( SF->preNodeSection( NNI, i ) ) {
+                if( ! NN->hasDataFor( SF->name(), 1 ) ) {
+                  if( NN->generateDeviceDataForCommonFile( *SF, i, NNI ) ) {
                     S = qApp->translate( "NetworkSettings", 
-                        "<p>Error in preNodeSection for file %1 and node %2</p>" ).
+                      "<p>Error in node part for file %1 and node %2</p>" ).
                         arg( SF->name() ).
-                        arg( NNI->netNode()->nodeName() );
+                        arg( NN->nodeName() );
                     return S;
                   }
+                }
+              }
+            } else {
+              // just request this once
+              if( SF->preDeviceSection( NNI, -1 ) ) {
+                S = qApp->translate( "NetworkSettings", 
+                    "<p>Error in preDeviceSection for file %1 and node %2</p>" ).
+                    arg( SF->name() ).
+                    arg( NN->nodeName() );
+                return S;
+              }
+
+              if( ! NN->hasDataFor( SF->name(), 1 ) ) {
+                if( NN->generateDeviceDataForCommonFile( *SF, -1, NNI ) ) {
+                  S = qApp->translate( "NetworkSettings", 
+                    "<p>Error in node part for file %1 and node %2</p>" ).
+                      arg( SF->name() ).
+                      arg( NN->nodeName() );
+                  return S;
+                }
+              }
+            }
+
+            // now generate profile specific data for all 
+            // connections working on a device of the current
+            // netnode type
+            for( QDictIterator<NodeCollection> ncit(M);
+                 ncit.current();
+                 ++ncit ) {
+              NC = ncit.current();
 
-                  if( NNI->netNode()->generateDataForCommonFile(*SF,i,NNI) ) {
+              NNI = NC->getToplevel();
+
+              // no output needed
+              if( ! NNI->netNode()->hasDataFor( SF->name(), 0 ) )
+                continue;
+
+              // get the netnode that serves as the device for this
+              // connection
+              AsDevice * Dev = NC->device();
+
+              if( CurDev ) {
+                if( CurDev != Dev ) {
+                  // other device -> later
+                  continue;
+                }
+
+                // generate 'entry' for every combination of device and profile
+                // each node delegates to deeper level
+                for( int i = 0; i < CurDev->count(); i ++ ) {
+                  if( SF->preNodeSection( NNI, i ) ) {
                     S = qApp->translate( "NetworkSettings", 
-                      "<p>Error in node part for file %1 and node %2</p>" ).
+                        "<p>Error in preNodeSection for file %1 and node %2</p>" ).
                         arg( SF->name() ).
@@ -320,2 +391,20 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) {
 
+                  // ask all nodes in connection 
+
+                  for( QListIterator<ANetNodeInstance> cncit(*NC); 
+                       cncit.current();
+                       ++cncit ) {
+                    NNI = cncit.current();
+
+                    if( NNI->netNode()->hasDataFor( SF->name(), 0 ) ) {
+                      if( NNI->netNode()->generateDataForCommonFile(*SF,i,NNI) ) {
+                        S = qApp->translate( "NetworkSettings", 
+                          "<p>Error in node part for file %1 and node %2</p>" ).
+                            arg( SF->name() ).
+                            arg( NNI->netNode()->nodeName() );
+                        return S;
+                      }
+                    }
+                  }
+
                   if( SF->postNodeSection( NNI, i ) ) {
@@ -328,5 +417,67 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) {
                 }
+
+              } else {
+                if( Dev ) {
+                  // other 
+                  continue;
+                }
+
+                // one entry to generate
+                if( SF->preNodeSection( NNI, -1 ) ) {
+                  S = qApp->translate( "NetworkSettings", 
+                      "<p>Error in preNodeSection for file %1 and node %2</p>" ).
+                      arg( SF->name() ).
+                      arg( NNI->netNode()->nodeName() );
+                  return S;
+                }
+
+                if( NNI->netNode()->generateDataForCommonFile(*SF,-1,NNI) ) {
+                  S = qApp->translate( "NetworkSettings", 
+                    "<p>Error in node part for file %1 and node %2</p>" ).
+                      arg( SF->name() ).
+                      arg( NNI->netNode()->nodeName() );
+                  return S;
+                }
+
+                if( SF->postNodeSection( NNI, -1 ) ) {
+                  S = qApp->translate( "NetworkSettings", 
+                      "<p>Error in postNodeSection for file %1 and node %2</p>" ).
+                          arg( SF->name() ).
+                          arg( NNI->netNode()->nodeName() );
+                  return S;
+                }
+              }
+
+              // generated some data
+              if( SF->postNodeSection( NNI, -1 ) ) {
+                S = qApp->translate( "NetworkSettings", 
+                    "<p>Error in postNodeSection for file %1 and node %2</p>" ).
+                        arg( SF->name() ).
+                        arg( NNI->netNode()->nodeName() );
+                return S;
+              }
+              *SF << endl;
+            }
+
+            if( CurDev ) {
+              // generate 'entry' for every combination of device and profile
+              // each node delegates to deeper level
+              for( int i = 0; i < CurDev->count(); i ++ ) {
+                if( SF->postDeviceSection( NNI, i ) ) {
+                  S = qApp->translate( "NetworkSettings", 
+                      "<p>Error in postDeviceSection for file %1 and node %2</p>" ).
+                          arg( SF->name() ).
+                          arg( NNI->netNode()->nodeName() );
+                  return S;
+                }
+              }
+            } else {
+              if( SF->postDeviceSection( NNI, -1 ) ) {
+                S = qApp->translate( "NetworkSettings", 
+                    "<p>Error in postDeviceSection for file %1 and node %2</p>" ).
+                        arg( SF->name() ).
+                        arg( NNI->netNode()->nodeName() );
+                return S;
               }
             }
-            *SF << endl;
           }
@@ -339,2 +490,3 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) {
           }
+
         } while( 0 );
diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.cpp b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
index 309c9a1..51d17ec 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NN.cpp
+++ b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
@@ -46,3 +46,3 @@ bool PPPNetNode::generateProperFilesFor(
 
-bool PPPNetNode::hasDataFor( const QString & ) {
+bool PPPNetNode::hasDataFor( const QString &, bool  ) {
       return 0;
@@ -57,2 +57,9 @@ bool PPPNetNode::generateDataForCommonFile(
 
+bool PPPNetNode::generateDeviceDataForCommonFile( 
+                                SystemFile & , 
+                                long ,
+                                ANetNodeInstance * ) {
+      return 1;
+}
+
 extern "C" {
diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.h b/noncore/settings/networksettings2/ppp/ppp_NN.h
index 3f9a338..8d56e7f 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NN.h
+++ b/noncore/settings/networksettings2/ppp/ppp_NN.h
@@ -30,5 +30,7 @@ public:
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool DS );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
 
diff --git a/noncore/settings/networksettings2/ppp/ppprun.cpp b/noncore/settings/networksettings2/ppp/ppprun.cpp
index 4ac0c5a..8c75df3 100644
--- a/noncore/settings/networksettings2/ppp/ppprun.cpp
+++ b/noncore/settings/networksettings2/ppp/ppprun.cpp
@@ -18,11 +18,3 @@ void PPPRun::detectState( NodeCollection * NC ) {
       // but could also be unavailable
-      ANetNodeInstance * NNI;
-      RuntimeInfo * RI;
-      NNI = AsDevice::netNode();
-      printf( "%p\n", NNI );
-      NNI = NNI->nextNode();
-      printf( "%p\n", NNI );
-      RI = NNI->runtime();
-      printf( "%p\n", RI );
-      RI->detectState( NC ); 
+      AsDevice::netNode()->nextNode()->runtime()->detectState( NC ); 
     }
diff --git a/noncore/settings/networksettings2/ppp/ppprun.h b/noncore/settings/networksettings2/ppp/ppprun.h
index abb9176..765aff2 100644
--- a/noncore/settings/networksettings2/ppp/ppprun.h
+++ b/noncore/settings/networksettings2/ppp/ppprun.h
@@ -17,4 +17,10 @@ public :
 
+      virtual AsDevice * asDevice( void ) 
+        { return (AsDevice *)this; }
+      virtual AsConnection * asConnection( void ) 
+        { return (AsConnection *)this; }
+
       virtual AsDevice * device( void ) 
-        { return AsDevice::asDevice(); }
+        { return (AsDevice *)this; }
+
       virtual RuntimeInfo * runtimeInfo( void ) 
diff --git a/noncore/settings/networksettings2/profile/profile_NN.cpp b/noncore/settings/networksettings2/profile/profile_NN.cpp
index c39b86f..fcf1ca6 100644
--- a/noncore/settings/networksettings2/profile/profile_NN.cpp
+++ b/noncore/settings/networksettings2/profile/profile_NN.cpp
@@ -45,3 +45,3 @@ bool ProfileNetNode::generateProperFilesFor(
 
-bool ProfileNetNode::hasDataFor( const QString & ) {
+bool ProfileNetNode::hasDataFor( const QString &, bool  ) {
       return 0;
@@ -56,2 +56,9 @@ bool ProfileNetNode::generateDataForCommonFile(
 
+bool ProfileNetNode::generateDeviceDataForCommonFile( 
+                                SystemFile & , 
+                                long ,
+                                ANetNodeInstance * ) {
+      return 1;
+}
+
 extern "C" {
diff --git a/noncore/settings/networksettings2/profile/profile_NN.h b/noncore/settings/networksettings2/profile/profile_NN.h
index 3c06947..b64a6dd 100644
--- a/noncore/settings/networksettings2/profile/profile_NN.h
+++ b/noncore/settings/networksettings2/profile/profile_NN.h
@@ -30,5 +30,7 @@ public:
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool DS );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
 
diff --git a/noncore/settings/networksettings2/profile/profilerun.cpp b/noncore/settings/networksettings2/profile/profilerun.cpp
index 90c37ed..feebf86 100644
--- a/noncore/settings/networksettings2/profile/profilerun.cpp
+++ b/noncore/settings/networksettings2/profile/profilerun.cpp
@@ -21,2 +21,3 @@ bool ProfileRun::setState( NodeCollection * NC, Action_t A ) {
         if( NC->currentState() == Disabled ) {
+          Data->Disabled = 0;
           NC->setCurrentState( Off ); // at least
@@ -24,3 +25,2 @@ bool ProfileRun::setState( NodeCollection * NC, Action_t A ) {
           NNNI->runtime()->detectState(NC);
-          return 1;
         }
@@ -28,14 +28,12 @@ bool ProfileRun::setState( NodeCollection * NC, Action_t A ) {
       case Disable :
-        if( NC->currentState() == IsUp ) {
-          // bring down -> make available
-          NNNI->runtime()->setState(NC, Down);
-        }
-        if( NC->currentState() == Available ) {
-          // make unavailable
-          NNNI->runtime()->setState(NC, Deactivate);
-        }
-        if( NC->currentState() > Available ) {
-          // could not disable 
-          return 0;
+        switch( NC->currentState() ) {
+          case IsUp :
+          case Available :
+            // bring Deactivate (will bring down) 
+            if( ! NNNI->runtime()->setState(NC, Deactivate) )
+              return 0;
+          default :
+            break;
         }
+        Data->Disabled = 1;
         NC->setCurrentState( Disabled );
diff --git a/noncore/settings/networksettings2/profile/profilerun.h b/noncore/settings/networksettings2/profile/profilerun.h
index d3797b5..6e8385c 100644
--- a/noncore/settings/networksettings2/profile/profilerun.h
+++ b/noncore/settings/networksettings2/profile/profilerun.h
@@ -22,2 +22,5 @@ public :
         { return Data->Description; }
+
+      virtual AsFullSetup * asFullSetup( void ) 
+        { return (AsFullSetup *)this; }
 private :
diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp
index c65771d..be4a2bc 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NN.cpp
@@ -44,3 +44,3 @@ bool USBNetNode::generateProperFilesFor(
 
-bool USBNetNode::hasDataFor( const QString & S ) {
+bool USBNetNode::hasDataFor( const QString & S, bool ) {
       return (S== "interfaces");
@@ -55,2 +55,9 @@ bool USBNetNode::generateDataForCommonFile(
 
+bool USBNetNode::generateDeviceDataForCommonFile( 
+                                SystemFile & S , 
+                                long DevNr,
+                                ANetNodeInstance * NNI) {
+      return ((AUSB *)NNI)->generateDeviceDataForCommonFile(S, DevNr);
+}
+
 extern "C" {
diff --git a/noncore/settings/networksettings2/usb/usb_NN.h b/noncore/settings/networksettings2/usb/usb_NN.h
index 8b97452..8ff5289 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.h
+++ b/noncore/settings/networksettings2/usb/usb_NN.h
@@ -30,5 +30,7 @@ public:
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool DeviceSpec );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
 
diff --git a/noncore/settings/networksettings2/usb/usb_NNI.cpp b/noncore/settings/networksettings2/usb/usb_NNI.cpp
index 4729416..6fcd6d5 100644
--- a/noncore/settings/networksettings2/usb/usb_NNI.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NNI.cpp
@@ -45,2 +45,13 @@ bool AUSB::generateDataForCommonFile( SystemFile & S, long DevNr ) {
 
+bool AUSB::generateDeviceDataForCommonFile( SystemFile & S, long DevNr ) {
+    AsDevice * Dev = runtime()->device();
+    QString NIC = Dev->genNic( DevNr );
 
+    if( S.name() == "interfaces" ) {
+      // generate mapping stanza for this interface
+      S << "# check if " << NIC << " can be brought UP" << endl;
+      S << "mapping " << NIC << endl;
+      S << "  script networksettings2-request" << endl << endl;
+    }
+    return 0;
+}
diff --git a/noncore/settings/networksettings2/usb/usb_NNI.h b/noncore/settings/networksettings2/usb/usb_NNI.h
index b09f17a..5dead36 100644
--- a/noncore/settings/networksettings2/usb/usb_NNI.h
+++ b/noncore/settings/networksettings2/usb/usb_NNI.h
@@ -30,2 +30,3 @@ public :
       bool generateDataForCommonFile( SystemFile & S, long DevNr );
+      bool generateDeviceDataForCommonFile( SystemFile & S, long DevNr );
 
diff --git a/noncore/settings/networksettings2/usb/usbrun.cpp b/noncore/settings/networksettings2/usb/usbrun.cpp
index 49b5a77..3007e79 100644
--- a/noncore/settings/networksettings2/usb/usbrun.cpp
+++ b/noncore/settings/networksettings2/usb/usbrun.cpp
@@ -36,4 +36,13 @@ void USBRun::detectState( NodeCollection * NC ) {
 
-    fprintf( stderr, "NUP\n" );
-    // definitively not up
+    fprintf( stderr, "Assigned %p\n", assignedInterface() );
+    if( ( Run = assignedInterface() ) ) {
+      // we already have an interface assigned -> still present ?
+      if( ! Run->IsUp ) {
+        // usb is still free -> keep assignment
+        NC->setCurrentState( Available );
+        return;
+      } // else interface is up but NOT us -> some other profile
+    }
+
+    // nothing (valid) assigned to us
     assignInterface( 0 );
@@ -45,7 +54,9 @@ void USBRun::detectState( NodeCollection * NC ) {
       Run = It.current();
+
       fprintf( stderr, "%s %d %d=%d %d\n",
-      Run->Name.latin1(),
-      handlesInterface( Run->Name ),
-          Run->CardType, ARPHRD_ETHER,
-          ! Run->IsUp );
+          Run->Name.latin1(),
+          handlesInterface( Run->Name ),
+              Run->CardType, ARPHRD_ETHER,
+              ! Run->IsUp );
+
       if( handlesInterface( Run->Name ) &&
@@ -54,3 +65,3 @@ void USBRun::detectState( NodeCollection * NC ) {
         ) {
-        fprintf( stderr, "OFF\n" );
+        fprintf( stderr, "Released(OFF)\n" );
         // proper type, and Not UP -> free
@@ -85,2 +96,3 @@ bool USBRun::setState( NodeCollection * NC, Action_t A ) {
           assignInterface( N );
+          fprintf( stderr, "Assing %p\n", N );
           NC->setCurrentState( Available );
@@ -94,4 +106,3 @@ bool USBRun::setState( NodeCollection * NC, Action_t A ) {
             return 0;
-        }
-        if( NC->currentState() != Available ) {
+        } else if( NC->currentState() != Available ) {
           return 1;
diff --git a/noncore/settings/networksettings2/usb/usbrun.h b/noncore/settings/networksettings2/usb/usbrun.h
index c9c9121..60f9fe8 100644
--- a/noncore/settings/networksettings2/usb/usbrun.h
+++ b/noncore/settings/networksettings2/usb/usbrun.h
@@ -20,5 +20,8 @@ public :
       virtual QString genNic( long nr );
+
       virtual AsDevice * device( void ) 
-        { return asDevice(); }
+        { return (AsDevice *)this; }
 
+      virtual AsDevice * asDevice( void ) 
+        { return (AsDevice *)this; }
 protected :
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.cpp b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
index c800929..f570fb2 100644
--- a/noncore/settings/networksettings2/vpn/vpn_NN.cpp
+++ b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
@@ -45,3 +45,3 @@ bool VPNNetNode::generateProperFilesFor(
 
-bool VPNNetNode::hasDataFor( const QString & ) {
+bool VPNNetNode::hasDataFor( const QString &, bool ) {
       return 0;
@@ -56,2 +56,9 @@ bool VPNNetNode::generateDataForCommonFile(
 
+bool VPNNetNode::generateDeviceDataForCommonFile( 
+                                SystemFile & , 
+                                long ,
+                                ANetNodeInstance * ) {
+      return 1;
+}
+
 extern "C" {
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.h b/noncore/settings/networksettings2/vpn/vpn_NN.h
index a113ab9..cdb5117 100644
--- a/noncore/settings/networksettings2/vpn/vpn_NN.h
+++ b/noncore/settings/networksettings2/vpn/vpn_NN.h
@@ -30,5 +30,7 @@ public:
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool DS );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
 
diff --git a/noncore/settings/networksettings2/vpn/vpnrun.h b/noncore/settings/networksettings2/vpn/vpnrun.h
index c221fd0..4d26298 100644
--- a/noncore/settings/networksettings2/vpn/vpnrun.h
+++ b/noncore/settings/networksettings2/vpn/vpnrun.h
@@ -14,2 +14,4 @@ public :
 
+      virtual AsConnection * asConnection( void ) 
+        { return (AsConnection *)this; }
 protected :
diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.cpp b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
index 5a26e41..e1e20c0 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NN.cpp
+++ b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
@@ -44,4 +44,4 @@ bool WLanNetNode::generateProperFilesFor(
 
-bool WLanNetNode::hasDataFor( const QString & ) {
-      return 0;
+bool WLanNetNode::hasDataFor( const QString & S, bool DS ) {
+      return DS && S == "interfaces";
 }
@@ -49,4 +49,4 @@ bool WLanNetNode::hasDataFor( const QString & ) {
 bool WLanNetNode::generateDataForCommonFile( 
-                                SystemFile & , 
-                                long,
+                                SystemFile &, 
+                                long ,
                                 ANetNodeInstance * ) {
@@ -55,2 +55,9 @@ bool WLanNetNode::generateDataForCommonFile(
 
+bool WLanNetNode::generateDeviceDataForCommonFile( 
+                                SystemFile & S, 
+                                long DevNr,
+                                ANetNodeInstance * NNI ) {
+      return ((AWLan *)NNI)->generateDeviceDataForCommonFile(S, DevNr);
+}
+
 extern "C" {
diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.h b/noncore/settings/networksettings2/wlan/wlan_NN.h
index 0728a79..9111995 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NN.h
+++ b/noncore/settings/networksettings2/wlan/wlan_NN.h
@@ -30,5 +30,7 @@ public:
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool DS );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
 
diff --git a/noncore/settings/networksettings2/wlan/wlan_NNI.cpp b/noncore/settings/networksettings2/wlan/wlan_NNI.cpp
index 92f3457..8b948e0 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NNI.cpp
+++ b/noncore/settings/networksettings2/wlan/wlan_NNI.cpp
@@ -30 +30,13 @@ void AWLan::commit( void ) {
 
+bool AWLan::generateDeviceDataForCommonFile( SystemFile & S, long DevNr ) {
+    AsDevice * Dev = runtime()->device();
+    QString NIC = Dev->genNic( DevNr );
+
+    if( S.name() == "interfaces" ) {
+      // generate mapping stanza for this interface
+      S << "# check if " << NIC << " can be brought UP" << endl;
+      S << "mapping " << NIC << endl;
+      S << "  script networksettings2-request" << endl << endl;
+    }
+    return 0;
+}
diff --git a/noncore/settings/networksettings2/wlan/wlan_NNI.h b/noncore/settings/networksettings2/wlan/wlan_NNI.h
index 8b695b5..e464c84 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NNI.h
+++ b/noncore/settings/networksettings2/wlan/wlan_NNI.h
@@ -29,2 +29,4 @@ public :
 
+      bool generateDeviceDataForCommonFile( SystemFile & S, long DevNr );
+
 protected :
diff --git a/noncore/settings/networksettings2/wlan/wlanrun.h b/noncore/settings/networksettings2/wlan/wlanrun.h
index 4cbb059..b853262 100644
--- a/noncore/settings/networksettings2/wlan/wlanrun.h
+++ b/noncore/settings/networksettings2/wlan/wlanrun.h
@@ -21,3 +21,5 @@ public :
       virtual AsDevice * device( void ) 
-        { return asDevice(); }
+        { return (AsDevice *)this; }
+      virtual AsDevice * asDevice( void ) 
+        { return (AsDevice *)this; }