1 |
vip-ire |
1.1 |
diff -Nur e-smith-base-5.8.0/root/etc/e-smith/templates/etc/sysconfig/network/40GATEWAYDEV e-smith-base-5.8.0_bz9610/root/etc/e-smith/templates/etc/sysconfig/network/40GATEWAYDEV |
2 |
|
|
--- e-smith-base-5.8.0/root/etc/e-smith/templates/etc/sysconfig/network/40GATEWAYDEV 2008-03-26 17:48:59.000000000 +0100 |
3 |
|
|
+++ e-smith-base-5.8.0_bz9610/root/etc/e-smith/templates/etc/sysconfig/network/40GATEWAYDEV 1970-01-01 01:00:00.000000000 +0100 |
4 |
|
|
@@ -1,8 +0,0 @@ |
5 |
|
|
-{ |
6 |
|
|
- return "" unless (defined $ExternalInterface && defined $GatewayIP); |
7 |
|
|
- |
8 |
|
|
- my $dev = ($ExternalInterface{Configuration} eq 'disabled') ? |
9 |
|
|
- $InternalInterface{Name} : |
10 |
|
|
- $ExternalInterface{Name}; |
11 |
|
|
- return "GATEWAYDEV=$dev"; |
12 |
|
|
-} |
13 |
|
|
diff -Nur e-smith-base-5.8.0/root/etc/e-smith/templates/etc/sysconfig/network/50GATEWAY e-smith-base-5.8.0_bz9610/root/etc/e-smith/templates/etc/sysconfig/network/50GATEWAY |
14 |
|
|
--- e-smith-base-5.8.0/root/etc/e-smith/templates/etc/sysconfig/network/50GATEWAY 2005-11-21 05:28:08.000000000 +0100 |
15 |
|
|
+++ e-smith-base-5.8.0_bz9610/root/etc/e-smith/templates/etc/sysconfig/network/50GATEWAY 1970-01-01 01:00:00.000000000 +0100 |
16 |
|
|
@@ -1,6 +0,0 @@ |
17 |
|
|
-{ |
18 |
|
|
- $OUT = "GATEWAY="; |
19 |
|
|
- |
20 |
|
|
- $OUT .= ($AccessType eq "dedicated" and defined $GatewayIP) ? $GatewayIP |
21 |
|
|
- : ""; |
22 |
|
|
-} |
23 |
|
|
diff -Nur e-smith-base-5.8.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/route-ethX/08Gateway e-smith-base-5.8.0_bz9610/root/etc/e-smith/templates/etc/sysconfig/network-scripts/route-ethX/08Gateway |
24 |
|
|
--- e-smith-base-5.8.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/route-ethX/08Gateway 1970-01-01 01:00:00.000000000 +0100 |
25 |
|
|
+++ e-smith-base-5.8.0_bz9610/root/etc/e-smith/templates/etc/sysconfig/network-scripts/route-ethX/08Gateway 2016-09-06 21:40:52.325865196 +0200 |
26 |
|
|
@@ -0,0 +1,7 @@ |
27 |
|
|
+{ |
28 |
|
|
+ return "" unless (defined $GatewayIP && ( |
29 |
|
|
+ ($SystemMode eq 'serveronly' && $InternalInterface{Name} eq $THIS_DEVICE ) || |
30 |
|
|
+ ($ExternalInterface{Name} eq $THIS_DEVICE) )); |
31 |
|
|
+ $OUT .= "$GatewayIP dev $THIS_DEVICE\n"; |
32 |
|
|
+ $OUT .= "default via $GatewayIP dev $THIS_DEVICE\n"; |
33 |
|
|
+} |
34 |
|
|
diff -Nur e-smith-base-5.8.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm e-smith-base-5.8.0_bz9610/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm |
35 |
|
|
--- e-smith-base-5.8.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm 2016-09-06 21:38:23.215953854 +0200 |
36 |
|
|
+++ e-smith-base-5.8.0_bz9610/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm 2016-09-06 21:46:06.424682868 +0200 |
37 |
|
|
@@ -1046,7 +1046,7 @@ |
38 |
|
|
$error = "address matches external interface address"; |
39 |
|
|
} |
40 |
|
|
elsif (!ipv4_in_network($db->get_value('ExternalIP'), |
41 |
|
|
- $db->get_value('ExternalNetmask'), "$choice/32")) |
42 |
|
|
+ $db->get_value('ExternalNetmask'), "$choice/32") && $db->get_value('ExternalNetmask') ne '255.255.255.255') |
43 |
|
|
{ |
44 |
|
|
$error = "address is not local"; |
45 |
|
|
} |