diff -Nur --exclude='*ifcfg*' --exclude='route-*' --exclude=device --exclude=20interfaceMac e-smith-base-5.4.0/root/etc/e-smith/db/configuration/defaults/EthernetAssign/type e-smith-base-5.4.0_bz7993/root/etc/e-smith/db/configuration/defaults/EthernetAssign/type
--- e-smith-base-5.4.0/root/etc/e-smith/db/configuration/defaults/EthernetAssign/type	2005-11-21 05:28:03.000000000 +0100
+++ e-smith-base-5.4.0_bz7993/root/etc/e-smith/db/configuration/defaults/EthernetAssign/type	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-normal
diff -Nur --exclude='*ifcfg*' --exclude='route-*' --exclude=device --exclude=20interfaceMac e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/10interfaces e-smith-base-5.4.0_bz7993/root/etc/e-smith/db/configuration/migrate/10interfaces
--- e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/10interfaces	2013-11-23 14:55:11.221490699 +0100
+++ e-smith-base-5.4.0_bz7993/root/etc/e-smith/db/configuration/migrate/10interfaces	2013-11-23 15:08:18.064427178 +0100
@@ -39,7 +39,9 @@
     my $internal = $DB->get("InternalInterface") ||
                    $DB->new_record("InternalInterface", {type => "interface"});
 
-    my $ethernet_assign = $DB->get_value('EthernetAssign') || "normal";
+    if (my $assign = $DB->get('EthernetAssign')){
+        $assign->delete;
+    }
     my $diald = $DB->get("diald");
     $diald->delete if $diald;
 
diff -Nur --exclude='*ifcfg*' --exclude='route-*' --exclude=device --exclude=20interfaceMac e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/20EthernetAssign e-smith-base-5.4.0_bz7993/root/etc/e-smith/db/configuration/migrate/20EthernetAssign
--- e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/20EthernetAssign	2005-11-21 05:28:05.000000000 +0100
+++ e-smith-base-5.4.0_bz7993/root/etc/e-smith/db/configuration/migrate/20EthernetAssign	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-{
-    # Unswap ethernet assignment unless drivers are the same
-    return unless defined $EthernetAssign
-	&& $EthernetAssign eq 'swapped';
-    $driver1 = $EthernetDriver1 || return;
-    $driver2 = $EthernetDriver2 || return;
-    unless ($driver1 eq $driver2)
-    {
-	$DB->get('EthernetDriver1')->merge_props(type => $driver2);
-	$DB->get('EthernetDriver2')->merge_props(type => $driver1);
-	$DB->get('EthernetAssign')->merge_props(type => 'normal');
-    }
-}
diff -Nur --exclude='*ifcfg*' --exclude='route-*' --exclude=device --exclude=20interfaceMac e-smith-base-5.4.0/root/etc/e-smith/tests/10e-smith-base/20interfaces.t e-smith-base-5.4.0_bz7993/root/etc/e-smith/tests/10e-smith-base/20interfaces.t
--- e-smith-base-5.4.0/root/etc/e-smith/tests/10e-smith-base/20interfaces.t	2005-11-21 05:28:10.000000000 +0100
+++ e-smith-base-5.4.0_bz7993/root/etc/e-smith/tests/10e-smith-base/20interfaces.t	2013-11-11 12:36:45.209744891 +0100
@@ -11,13 +11,9 @@
 
 my $internal = $db->get('InternalInterface');
 my $external = $db->get('ExternalInterface');
-my $assign = $db->get_value('EthernetAssign');
 
 # Test the internal interface.
-ok( $assign =~ /^(normal|swapped)$/, "EthernetAssign is set" );
 ok( $internal, "InternalInterface exists" );
-ok( $internal->prop('Name') eq ($assign eq 'swapped' ? "eth1" : "eth0"),
-	"InternalInterface is named correctly" );
 ok( $internal->prop('type') eq 'interface', "InternalInterface is an interface" );
 ok( $internal->prop('Configuration') eq 'static',
 	"InternalInterface Configuration is static" );
@@ -61,17 +57,10 @@
 		"ExternalInterface Configuration is pppoe" );
 	ok( $external->prop('Name') eq 'ppp0', "ExternalInterface name is ppp0" );
     }
-    elsif ($assign eq 'swapped')
-    {
-	ok( $external->prop('Driver') eq $db->get_value("EthernetDriver1"),
-		"ExternalInterface Driver is correct" );
-	ok( $external->prop('Name') eq 'eth0', "ExternalInterface Name is eth0" );
-    }
     else
     {
 	ok( $external->prop('Driver') eq $db->get_value("EthernetDriver2"),
 		"ExternalInterface Driver is correct" );
-	ok( $external->prop('Name') eq 'eth1', "ExternalInterface Name is eth1" );
     }
 
     if ($db->get_value("ExternalDHCP") eq "on")
diff -Nur --exclude='*ifcfg*' --exclude='route-*' --exclude=device --exclude=20interfaceMac e-smith-base-5.4.0/root/etc/e-smith/tests/10e-smith-base/configuration.conf e-smith-base-5.4.0_bz7993/root/etc/e-smith/tests/10e-smith-base/configuration.conf
--- e-smith-base-5.4.0/root/etc/e-smith/tests/10e-smith-base/configuration.conf	2013-11-23 14:55:11.181490594 +0100
+++ e-smith-base-5.4.0_bz7993/root/etc/e-smith/tests/10e-smith-base/configuration.conf	2013-11-11 12:35:09.695598825 +0100
@@ -23,7 +23,6 @@
 DialupUserPassword=userpassword
 DomainName=e-smith.com
 EmailUnknownUser=returntosender
-EthernetAssign=normal
 EthernetDriver1=pcnet32
 EthernetDriver2=unknown
 ExternalDHCP=off
diff -Nur --exclude='*ifcfg*' --exclude='route-*' --exclude=device --exclude=20interfaceMac e-smith-base-5.4.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm e-smith-base-5.4.0_bz7993/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm
--- e-smith-base-5.4.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm	2013-11-23 14:55:11.223490704 +0100
+++ e-smith-base-5.4.0_bz7993/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm	2013-11-11 12:34:48.742558248 +0100
@@ -554,8 +554,6 @@
         goto ETHERNET_EXTERNAL;
     }
 
-    $db->set_value('EthernetAssign', "normal");
-
     goto SERVER_GATEWAY_DEDICATED;
 }