Attachment 3435 Details for Bug 8811 – drakx-net-1.12.2-HWADDR_and_MACADDR_and_ETHTOOL_OPTS.diff

[patch] drakx-net-1.12.2-HWADDR_and_MACADDR_and_ETHTOOL_OPTS.diff

drakx-net-1.12.2-HWADDR_and_MACADDR_and_ETHTOOL_OPTS.diff (text/plain), 3.57 KB, created by Oden Eriksson on 2013-01-25 10:39:58 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Oden Eriksson

Created: 2013-01-25 10:39:58 CET

Size: 3.57 KB

patch

obsolete

>diff -Naurp drakx-net-1.12.2/lib/network/connection.pm drakx-net-1.12.2.oden/lib/network/connection.pm
>--- drakx-net-1.12.2/lib/network/connection.pm	2012-09-06 00:17:11.000000000 +0200
>+++ drakx-net-1.12.2.oden/lib/network/connection.pm	2013-01-24 12:39:07.530729664 +0100
>@@ -148,6 +148,9 @@ sub load_interface_settings {
>     $self->{control}{userctl} = $self->get_ifcfg_bool('USERCTL');
>     $self->{control}{metric} = $self->{ifcfg}{METRIC};
>     $self->{control}{mtu} = $self->{ifcfg}{MTU};
>+    $self->{control}{macaddr} = $self->{ifcfg}{MACADDR};
>+    $self->{control}{hwaddr} = $self->{ifcfg}{HWADDR};
>+    $self->{control}{ethtool_opts} = $self->{ifcfg}{ETHTOOL_OPTS};
>     $self->{control}{accounting} = $self->get_ifcfg_bool('ACCOUNTING');
>     $self->{control}{nm_controlled} = $self->get_ifcfg_bool('NM_CONTROLLED');
>     $self->{control}{uuid} = $self->{ifcfg}{UUID};
>@@ -249,7 +252,13 @@ sub get_control_settings {
>         { text => N("Allow interface to be controlled by Network Manager"), val => \$self->{control}{nm_controlled}, type => "bool" },
>         { label => N("Metric"), val => \$self->{control}{metric}, advanced => 1 },
>         { label => N("MTU"), val => \$self->{control}{mtu}, advanced => 1,
>-          help => N("Maximum size of network message (MTU). If unsure, left blank.") },
>+          help => N("Maximum size of network message (MTU). If unsure, left blank."), },
>+        { label => N("MACADDR"), val => \$self->{control}{macaddr}, advanced => 1,
>+          help => N("Use a fake MAC address. If unset, uses HWADDR or default.") },
>+        { label => N("HWADDR"), val => \$self->{control}{hwaddr}, advanced => 1,
>+          help => N("Set the MAC address. If unset, uses default.") },
>+        { label => N("ETHTOOL_OPTS"), val => \$self->{control}{ethtool_opts}, advanced => 1,
>+          help => N("Use ethtool to pass options to the NIC. eg. \"autoneg off wol g\"") },
>     ];
> }
> 
>@@ -263,6 +272,9 @@ sub build_ifcfg_settings {
>         USERCTL => bool2yesno($self->{control}{userctl}),
>         METRIC => $self->{control}{metric},
>         MTU => $self->{control}{mtu},
>+        MACADDR => $self->{control}{macaddr},
>+        HWADDR => $self->{control}{hwaddr},
>+        ETHTOOL_OPTS => $self->{control}{ethtool_opts},
>         UUID => $self->{control}{uuid},
>         NAME => $self->{control}{name},
>         LAST_CONNECT => $self->{control}{last_connect},
>diff -Naurp drakx-net-1.12.2/lib/network/network.pm drakx-net-1.12.2.oden/lib/network/network.pm
>--- drakx-net-1.12.2/lib/network/network.pm	2012-09-06 00:17:11.000000000 +0200
>+++ drakx-net-1.12.2.oden/lib/network/network.pm	2013-01-24 11:43:54.030544387 +0100
>@@ -187,7 +187,7 @@ sub update_broadcast_and_network {
> 
> sub write_interface_settings {
>     my ($intf, $file) = @_;
>-    setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST GATEWAY ONBOOT HWADDR METRIC MII_NOT_SUPPORTED TYPE USERCTL ATM_ADDR ATM_DEVICE ETHTOOL_OPTS VLAN MTU DNS1 DNS2 DOMAIN RESOLV_MODS LINK_DETECTION_DELAY),
>+    setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST GATEWAY ONBOOT HWADDR MACADDR METRIC MII_NOT_SUPPORTED TYPE USERCTL ATM_ADDR ATM_DEVICE ETHTOOL_OPTS VLAN MTU DNS1 DNS2 DOMAIN RESOLV_MODS LINK_DETECTION_DELAY),
>                 qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_ENC_MODE WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV WIRELESS_WPA_DRIVER WIRELESS_WPA_REASSOCIATE CRDA_DOMAIN),
>                 qw(DVB_ADAPTER_ID DVB_NETWORK_DEMUX DVB_NETWORK_PID),
>                 qw(IPV6INIT IPV6TO4INIT),

diff -Naurp drakx-net-1.12.2/lib/network/connection.pm drakx-net-1.12.2.oden/lib/network/connection.pm
--- drakx-net-1.12.2/lib/network/connection.pm	2012-09-06 00:17:11.000000000 +0200
+++ drakx-net-1.12.2.oden/lib/network/connection.pm	2013-01-24 12:39:07.530729664 +0100
@@ -148,6 +148,9 @@ sub load_interface_settings {
     $self->{control}{userctl} = $self->get_ifcfg_bool('USERCTL');
     $self->{control}{metric} = $self->{ifcfg}{METRIC};
     $self->{control}{mtu} = $self->{ifcfg}{MTU};
+    $self->{control}{macaddr} = $self->{ifcfg}{MACADDR};
+    $self->{control}{hwaddr} = $self->{ifcfg}{HWADDR};
+    $self->{control}{ethtool_opts} = $self->{ifcfg}{ETHTOOL_OPTS};
     $self->{control}{accounting} = $self->get_ifcfg_bool('ACCOUNTING');
     $self->{control}{nm_controlled} = $self->get_ifcfg_bool('NM_CONTROLLED');
     $self->{control}{uuid} = $self->{ifcfg}{UUID};
@@ -249,7 +252,13 @@ sub get_control_settings {
         { text => N("Allow interface to be controlled by Network Manager"), val => \$self->{control}{nm_controlled}, type => "bool" },
         { label => N("Metric"), val => \$self->{control}{metric}, advanced => 1 },
         { label => N("MTU"), val => \$self->{control}{mtu}, advanced => 1,
-          help => N("Maximum size of network message (MTU). If unsure, left blank.") },
+          help => N("Maximum size of network message (MTU). If unsure, left blank."), },
+        { label => N("MACADDR"), val => \$self->{control}{macaddr}, advanced => 1,
+          help => N("Use a fake MAC address. If unset, uses HWADDR or default.") },
+        { label => N("HWADDR"), val => \$self->{control}{hwaddr}, advanced => 1,
+          help => N("Set the MAC address. If unset, uses default.") },
+        { label => N("ETHTOOL_OPTS"), val => \$self->{control}{ethtool_opts}, advanced => 1,
+          help => N("Use ethtool to pass options to the NIC. eg. \"autoneg off wol g\"") },
     ];
 }
 
@@ -263,6 +272,9 @@ sub build_ifcfg_settings {
         USERCTL => bool2yesno($self->{control}{userctl}),
         METRIC => $self->{control}{metric},
         MTU => $self->{control}{mtu},
+        MACADDR => $self->{control}{macaddr},
+        HWADDR => $self->{control}{hwaddr},
+        ETHTOOL_OPTS => $self->{control}{ethtool_opts},
         UUID => $self->{control}{uuid},
         NAME => $self->{control}{name},
         LAST_CONNECT => $self->{control}{last_connect},
diff -Naurp drakx-net-1.12.2/lib/network/network.pm drakx-net-1.12.2.oden/lib/network/network.pm
--- drakx-net-1.12.2/lib/network/network.pm	2012-09-06 00:17:11.000000000 +0200
+++ drakx-net-1.12.2.oden/lib/network/network.pm	2013-01-24 11:43:54.030544387 +0100
@@ -187,7 +187,7 @@ sub update_broadcast_and_network {
 
 sub write_interface_settings {
     my ($intf, $file) = @_;
-    setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST GATEWAY ONBOOT HWADDR METRIC MII_NOT_SUPPORTED TYPE USERCTL ATM_ADDR ATM_DEVICE ETHTOOL_OPTS VLAN MTU DNS1 DNS2 DOMAIN RESOLV_MODS LINK_DETECTION_DELAY),
+    setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST GATEWAY ONBOOT HWADDR MACADDR METRIC MII_NOT_SUPPORTED TYPE USERCTL ATM_ADDR ATM_DEVICE ETHTOOL_OPTS VLAN MTU DNS1 DNS2 DOMAIN RESOLV_MODS LINK_DETECTION_DELAY),
                 qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_ENC_MODE WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV WIRELESS_WPA_DRIVER WIRELESS_WPA_REASSOCIATE CRDA_DOMAIN),
                 qw(DVB_ADAPTER_ID DVB_NETWORK_DEMUX DVB_NETWORK_PID),
                 qw(IPV6INIT IPV6TO4INIT),

Actions: View | Diff

Attachments on bug 8811: 3435