Attachment 305536 Details for Bug 446743 – Copy info from DNS page into each ifcfg file

[patch] Copy info from DNS page into each ifcfg file

dns-in-ifcfg.patch (text/plain), 3.52 KB, created by Dan Williams on 2008-05-15 20:10:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Williams

Created: 2008-05-15 20:10:41 UTC

Size: 3.52 KB

patch

obsolete

>diff -up system-config-network-1.5.7/src/netconfpkg/DeviceList.idl.dns-in-ifcfg system-config-network-1.5.7/src/netconfpkg/DeviceList.idl
>--- system-config-network-1.5.7/src/netconfpkg/DeviceList.idl.dns-in-ifcfg	2008-04-25 07:38:40.000000000 -0400
>+++ system-config-network-1.5.7/src/netconfpkg/DeviceList.idl	2008-05-15 15:47:24.000000000 -0400
>@@ -39,6 +39,12 @@
> 
>       <Slave TYPE="BOOL" VALUE="FALSE"/>
> 
>+      <PrimaryDNS TYPE="STRING" VALUE=""/>
>+      <SecondaryDNS TYPE="STRING" VALUE=""/>
>+      <TertiaryDNS TYPE="STRING" VALUE=""/>
>+      <Searches TYPE="LIST" ANONYMOUS="TRUE">
>+        </Searches>
>+
>       <Extra TYPE="LIST">
>         </Extra>
> 
>diff -up system-config-network-1.5.7/src/netconfpkg/gui/maindialog.py.dns-in-ifcfg system-config-network-1.5.7/src/netconfpkg/gui/maindialog.py
>--- system-config-network-1.5.7/src/netconfpkg/gui/maindialog.py.dns-in-ifcfg	2008-05-15 15:48:43.000000000 -0400
>+++ system-config-network-1.5.7/src/netconfpkg/gui/maindialog.py	2008-05-15 15:48:48.000000000 -0400
>@@ -410,7 +410,7 @@ class mainDialog:
>     def saveDevices(self):
>         self.appBar.push(_("Saving device configuration..."))
>         devicelist = getDeviceList()
>-        devicelist.save()
>+        devicelist.save(self.getActiveProfile())
>         devicelist.setChanged(False)
>         self.appBar.pop()
> 
>diff -up system-config-network-1.5.7/src/netconfpkg/NCDeviceList.py.dns-in-ifcfg system-config-network-1.5.7/src/netconfpkg/NCDeviceList.py
>--- system-config-network-1.5.7/src/netconfpkg/NCDeviceList.py.dns-in-ifcfg	2008-04-25 07:38:40.000000000 -0400
>+++ system-config-network-1.5.7/src/netconfpkg/NCDeviceList.py	2008-05-15 15:47:15.000000000 -0400
>@@ -179,7 +179,7 @@ class DeviceList(DeviceList_base):
>         dev.DeviceId = vals[1]
>         dev._parseLine(vals[2:], value)
> 
>-    def save(self):
>+    def save(self, act_prof):
>         # FIXME: [163040] "Exception Occurred" when saving
>         # fail gracefully, with informing, which file, and why
> 
>@@ -227,6 +227,7 @@ class DeviceList(DeviceList_base):
>             # really save the device
>             #
>             #if dev.changed:
>+            dev.updateDNS(act_prof.DNS.PrimaryDNS, act_prof.DNS.SecondaryDNS, act_prof.DNS.TertiaryDNS, act_prof.DNS.SearchList)
>             dev.save()
> 
>         papconf.write()
>diff -up system-config-network-1.5.7/src/netconfpkg/NCDevice.py.dns-in-ifcfg system-config-network-1.5.7/src/netconfpkg/NCDevice.py
>--- system-config-network-1.5.7/src/netconfpkg/NCDevice.py.dns-in-ifcfg	2008-04-25 07:38:40.000000000 -0400
>+++ system-config-network-1.5.7/src/netconfpkg/NCDevice.py	2008-05-15 15:47:27.000000000 -0400
>@@ -88,6 +88,10 @@ class Device( Device_base ):
>                 'BootProto' : 'BOOTPROTO',
>                 'Type' : 'TYPE',
>                 'HardwareAddress' : 'HWADDR',
>+                'PrimaryDNS' : 'DNS1',
>+                'SecondaryDNS' : 'DNS2',
>+                'TertiaryDNS' : 'DNS3',
>+                'Searches' : 'SEARCH',
>                 }
> 
>     intkeydict = {
>@@ -279,6 +283,16 @@ class Device( Device_base ):
>                 
>         self.commit( changed=False )
> 
>+    def updateDNS( self, primary, secondary, tertiary, searches ):
>+        # Dialup pulls DNS info from it's own database
>+        if self.Dialup:
>+            return;
>+
>+        self.PrimaryDNS = primary
>+        self.SecondaryDNS = secondary
>+        self.TertiaryDNS = tertiary
>+        self.Searches = " ".join(searches)
>+
>     def save( self ):
>         # FIXME: [163040] "Exception Occurred" when saving
>         # fail gracefully, with informing, which file, and why

Actions: View | Diff

Attachments on bug 446743: 305536 | 305675