summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Bichis <servere@afk.ro>2019-01-28 21:34:06 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2019-01-28 22:10:05 +0000
commitec375d10cc51d423ec2b72a123e70f745a5c5b47 (patch)
tree7109068f43f3f317a84fdf401324424791120b58
parentdf4304563a70a70709f56790680436421e60de27 (diff)
downloaddrakx-net-ec375d10cc51d423ec2b72a123e70f745a5c5b47.tar
drakx-net-ec375d10cc51d423ec2b72a123e70f745a5c5b47.tar.gz
drakx-net-ec375d10cc51d423ec2b72a123e70f745a5c5b47.tar.bz2
drakx-net-ec375d10cc51d423ec2b72a123e70f745a5c5b47.tar.xz
drakx-net-ec375d10cc51d423ec2b72a123e70f745a5c5b47.zip
Add advanced option to set NOZEROCONF in /etc/sysconfig/network (mga#23282)
-rw-r--r--NEWS1
-rw-r--r--lib/network/network.pm3
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index fc4e55d..0f87f18 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- add advanced option to set NOZEROCONF in /etc/sysconfig/network (mga#23282)
- use SNI when running under Enlightenment (mga#23954)
- force use of X11 backend when running on Wayland (mga#20680)
- drakfirewall: drop references to nonexistant mydsn, udhcpd, imap,
diff --git a/lib/network/network.pm b/lib/network/network.pm
index 6b78b4c..ba1e022 100644
--- a/lib/network/network.pm
+++ b/lib/network/network.pm
@@ -109,7 +109,7 @@ sub write_network_conf {
}
$net->{network}{NETWORKING} = 'yes';
- setVarsInSh($::prefix . $network_file, $net->{network}, qw(HOSTNAME NETWORKING GATEWAY GATEWAYDEV NISDOMAIN FORWARD_IPV4 NETWORKING_IPV6 IPV6_DEFAULTDEV CRDA_DOMAIN));
+ setVarsInSh($::prefix . $network_file, $net->{network}, qw(HOSTNAME NETWORKING GATEWAY GATEWAYDEV NISDOMAIN FORWARD_IPV4 NETWORKING_IPV6 IPV6_DEFAULTDEV NOZEROCONF CRDA_DOMAIN));
output($::prefix . $hostname_file, ($net->{network}{HOSTNAME} || "localhost") . "\n");
}
@@ -530,6 +530,7 @@ sub advanced_choose {
{ text => N("Disable IPv6"), val => \$u->{ipv6_disabled}, type => "bool" },
{ text => N("Disable TCP Window Scaling"), val => \$u->{disable_window_scaling}, type => "bool" },
{ text => N("Disable TCP Timestamps"), val => \$u->{disable_tcp_timestamps}, type => "bool" },
+ { text => N("Disable ZEROCONF route"), val => \$net->{network}{NOZEROCONF}, type => "bool" },
{ label => "<b>" . N("Security settings (defined by MSEC policy)") . "</b>" },
{ text => N("Disable ICMP echo"), val => \$u->{disable_icmp}, type => "bool", disabled => sub { $u->{msec} } },
{ text => N("Disable ICMP echo for broadcasting messages"), val => \$u->{disable_icmp_broadcasts}, type => "bool", disabled => sub { $u->{msec} } },