/[smeserver]/rpms/e-smith-base/sme9/e-smith-base-5.4.0-remove_interface_swap.patch
ViewVC logotype

Contents of /rpms/e-smith-base/sme9/e-smith-base-5.4.0-remove_interface_swap.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.2 - (show annotations) (download)
Mon Mar 24 03:05:36 2014 UTC (10 years, 3 months ago) by wellsi
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED 
* Sun Mar 23 2014 Ian Wells <esmith@wellsi.com> 5.6.0-1.sme
- Roll new stream to remove obsolete images [SME: 7962]
1 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
2 --- e-smith-base-5.4.0/root/etc/e-smith/db/configuration/defaults/EthernetAssign/type 2005-11-21 05:28:03.000000000 +0100
3 +++ e-smith-base-5.4.0_bz7993/root/etc/e-smith/db/configuration/defaults/EthernetAssign/type 1970-01-01 01:00:00.000000000 +0100
4 @@ -1 +0,0 @@
5 -normal
6 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
7 --- e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/10interfaces 2013-11-23 14:55:11.221490699 +0100
8 +++ e-smith-base-5.4.0_bz7993/root/etc/e-smith/db/configuration/migrate/10interfaces 2013-11-23 15:08:18.064427178 +0100
9 @@ -39,7 +39,9 @@
10 my $internal = $DB->get("InternalInterface") ||
11 $DB->new_record("InternalInterface", {type => "interface"});
12
13 - my $ethernet_assign = $DB->get_value('EthernetAssign') || "normal";
14 + if (my $assign = $DB->get('EthernetAssign')){
15 + $assign->delete;
16 + }
17 my $diald = $DB->get("diald");
18 $diald->delete if $diald;
19
20 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
21 --- e-smith-base-5.4.0/root/etc/e-smith/db/configuration/migrate/20EthernetAssign 2005-11-21 05:28:05.000000000 +0100
22 +++ e-smith-base-5.4.0_bz7993/root/etc/e-smith/db/configuration/migrate/20EthernetAssign 1970-01-01 01:00:00.000000000 +0100
23 @@ -1,13 +0,0 @@
24 -{
25 - # Unswap ethernet assignment unless drivers are the same
26 - return unless defined $EthernetAssign
27 - && $EthernetAssign eq 'swapped';
28 - $driver1 = $EthernetDriver1 || return;
29 - $driver2 = $EthernetDriver2 || return;
30 - unless ($driver1 eq $driver2)
31 - {
32 - $DB->get('EthernetDriver1')->merge_props(type => $driver2);
33 - $DB->get('EthernetDriver2')->merge_props(type => $driver1);
34 - $DB->get('EthernetAssign')->merge_props(type => 'normal');
35 - }
36 -}
37 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
38 --- e-smith-base-5.4.0/root/etc/e-smith/tests/10e-smith-base/20interfaces.t 2005-11-21 05:28:10.000000000 +0100
39 +++ 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
40 @@ -11,13 +11,9 @@
41
42 my $internal = $db->get('InternalInterface');
43 my $external = $db->get('ExternalInterface');
44 -my $assign = $db->get_value('EthernetAssign');
45
46 # Test the internal interface.
47 -ok( $assign =~ /^(normal|swapped)$/, "EthernetAssign is set" );
48 ok( $internal, "InternalInterface exists" );
49 -ok( $internal->prop('Name') eq ($assign eq 'swapped' ? "eth1" : "eth0"),
50 - "InternalInterface is named correctly" );
51 ok( $internal->prop('type') eq 'interface', "InternalInterface is an interface" );
52 ok( $internal->prop('Configuration') eq 'static',
53 "InternalInterface Configuration is static" );
54 @@ -61,17 +57,10 @@
55 "ExternalInterface Configuration is pppoe" );
56 ok( $external->prop('Name') eq 'ppp0', "ExternalInterface name is ppp0" );
57 }
58 - elsif ($assign eq 'swapped')
59 - {
60 - ok( $external->prop('Driver') eq $db->get_value("EthernetDriver1"),
61 - "ExternalInterface Driver is correct" );
62 - ok( $external->prop('Name') eq 'eth0', "ExternalInterface Name is eth0" );
63 - }
64 else
65 {
66 ok( $external->prop('Driver') eq $db->get_value("EthernetDriver2"),
67 "ExternalInterface Driver is correct" );
68 - ok( $external->prop('Name') eq 'eth1', "ExternalInterface Name is eth1" );
69 }
70
71 if ($db->get_value("ExternalDHCP") eq "on")
72 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
73 --- e-smith-base-5.4.0/root/etc/e-smith/tests/10e-smith-base/configuration.conf 2013-11-23 14:55:11.181490594 +0100
74 +++ 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
75 @@ -23,7 +23,6 @@
76 DialupUserPassword=userpassword
77 DomainName=e-smith.com
78 EmailUnknownUser=returntosender
79 -EthernetAssign=normal
80 EthernetDriver1=pcnet32
81 EthernetDriver2=unknown
82 ExternalDHCP=off
83 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
84 --- e-smith-base-5.4.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm 2013-11-23 14:55:11.223490704 +0100
85 +++ 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
86 @@ -554,8 +554,6 @@
87 goto ETHERNET_EXTERNAL;
88 }
89
90 - $db->set_value('EthernetAssign', "normal");
91 -
92 goto SERVER_GATEWAY_DEDICATED;
93 }
94
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed