Attachment 10691 Details for Bug 23282 – Patch rebased against git master

Patch rebased against git master

0001-Add-advanced-option-to-set-NOZEROCONF-in-etc-sysconf.patch (text/plain), 1.73 KB, created by Martin Whitaker on 2019-01-28 22:45:15 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2019-01-28 22:45:15 CET

Size: 1.73 KB

patch

obsolete

>From 76012b466e2358cb305855d119f66a25cc603a29 Mon Sep 17 00:00:00 2001
>From: Paul Bichis <servere@afk.ro>
>Date: Mon, 28 Jan 2019 21:34:06 +0000
>Subject: [PATCH] Add advanced option to set NOZEROCONF in
> /etc/sysconfig/network (mga#23282)
>
>
>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} } },
>-- 
>2.13.7
>

From 76012b466e2358cb305855d119f66a25cc603a29 Mon Sep 17 00:00:00 2001
From: Paul Bichis <servere@afk.ro>
Date: Mon, 28 Jan 2019 21:34:06 +0000
Subject: [PATCH] Add advanced option to set NOZEROCONF in
 /etc/sysconfig/network (mga#23282)


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} } },
-- 
2.13.7

Actions: View

Attachments on bug 23282: 10685 | 10686 | 10691