From de461abaa61c3210a53684ac611877a0b10c2b79 Mon Sep 17 00:00:00 2001 From: songnannan Date: Mon, 30 Dec 2019 14:45:06 +0800 Subject: [PATCH 1/2] init --- anaconda.spec | 10 +- ...ing-virtual-device-in-network-spokes.patch | 119 ++++++++++++++++++ 2 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 bugfix-disable-adding-virtual-device-in-network-spokes.patch diff --git a/anaconda.spec b/anaconda.spec index 37a829b..2d784df 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -3,7 +3,7 @@ Name: anaconda Version: 29.24.7 -Release: 15 +Release: 16 Summary: Graphical system installer License: GPLv2+ and MIT URL: https://fedoraproject.org/wiki/Anaconda @@ -38,6 +38,7 @@ Patch9020: anaconda-hide-help-button.patch Patch9021: anaconda-add-quiet-cmdline-args-for-x86.patch Patch9022: anaconda-modify-interface-is-extended-in-Chinese-mod.patch Patch9023: bugfix-fix-vender-issue.patch +Patch9024: bugfix-disable-adding-virtual-device-in-network-spokes.patch BuildRequires: audit-libs-devel libtool gettext-devel >= 0.19.8 gtk3-devel >= 3.22.17 BuildRequires: gtk-doc gtk3-devel-docs >= 3.22.17 glib2-doc gobject-introspection-devel @@ -210,6 +211,13 @@ update-desktop-database &> /dev/null || : %{_datadir}/gtk-doc %changelog +* Mon Dec 30 2019 openEuler Buildteam - 29.24.7-16 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:bugfix in network spokes when add virtual devices + + * Mon Dec 30 2019 openEuler Buildteam - 29.24.7-15 - Type:bugfix - ID:NA diff --git a/bugfix-disable-adding-virtual-device-in-network-spokes.patch b/bugfix-disable-adding-virtual-device-in-network-spokes.patch new file mode 100644 index 0000000..5a1096b --- /dev/null +++ b/bugfix-disable-adding-virtual-device-in-network-spokes.patch @@ -0,0 +1,119 @@ +From 234cfa065b655448f94e63ab1e80e0cb8cf3e94e Mon Sep 17 00:00:00 2001 +From: songnannan +Date: Mon, 30 Dec 2019 14:38:08 +0800 +Subject: [PATCH] disable adding virtual device in network spokes + +--- + pyanaconda/ui/gui/spokes/network.glade | 45 ---------------------------------- + pyanaconda/ui/gui/spokes/network.py | 18 +++++++------- + 2 files changed, 9 insertions(+), 54 deletions(-) + +diff --git a/pyanaconda/ui/gui/spokes/network.glade b/pyanaconda/ui/gui/spokes/network.glade +index c5d20ce..6624234 100644 +--- a/pyanaconda/ui/gui/spokes/network.glade ++++ b/pyanaconda/ui/gui/spokes/network.glade +@@ -258,51 +258,6 @@ + 0 + + +- +- +- True +- False +- icons +- False +- 1 +- +- +- 42 +- 36 +- True +- False +- True +- list-add-symbolic +- +- +- False +- True +- +- +- +- +- 42 +- 36 +- True +- False +- True +- list-remove-symbolic +- +- +- False +- True +- +- +- +- +- +- False +- True +- 1 +- +- + + + True +diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py +index 436e814..e84ac67 100644 +--- a/pyanaconda/ui/gui/spokes/network.py ++++ b/pyanaconda/ui/gui/spokes/network.py +@@ -291,12 +291,12 @@ class NetworkControlBox(GObject.GObject): + self.client = client + + # button for creating of virtual bond and vlan devices +- self.builder.get_object("add_toolbutton").set_sensitive(True) +- self.builder.get_object("add_toolbutton").connect("clicked", +- self.on_add_device_clicked) +- self.builder.get_object("remove_toolbutton").set_sensitive(False) +- self.builder.get_object("remove_toolbutton").connect("clicked", +- self.on_remove_device_clicked) ++ #self.builder.get_object("add_toolbutton").set_sensitive(True) ++ #self.builder.get_object("add_toolbutton").connect("clicked", ++ # self.on_add_device_clicked) ++ #self.builder.get_object("remove_toolbutton").set_sensitive(False) ++ #self.builder.get_object("remove_toolbutton").connect("clicked", ++ # self.on_remove_device_clicked) + + not_supported = ["start_hotspot_button", + "stop_hotspot_button", +@@ -1069,7 +1069,7 @@ class NetworkControlBox(GObject.GObject): + self.builder.get_object("label_wired_vlanid").hide() + self.builder.get_object("heading_wired_parent").hide() + self.builder.get_object("label_wired_parent").hide() +- self.builder.get_object("remove_toolbutton").set_sensitive(False) ++ #self.builder.get_object("remove_toolbutton").set_sensitive(False) + elif dev_type in [NM.DeviceType.BOND, + NM.DeviceType.TEAM, + NM.DeviceType.BRIDGE]: +@@ -1080,7 +1080,7 @@ class NetworkControlBox(GObject.GObject): + self.builder.get_object("label_wired_vlanid").hide() + self.builder.get_object("heading_wired_parent").hide() + self.builder.get_object("label_wired_parent").hide() +- self.builder.get_object("remove_toolbutton").set_sensitive(True) ++ #self.builder.get_object("remove_toolbutton").set_sensitive(True) + elif dev_type == NM.DeviceType.VLAN: + notebook.set_current_page(0) + self.builder.get_object("heading_wired_slaves").hide() +@@ -1089,7 +1089,7 @@ class NetworkControlBox(GObject.GObject): + self.builder.get_object("label_wired_vlanid").show() + self.builder.get_object("heading_wired_parent").show() + self.builder.get_object("label_wired_parent").show() +- self.builder.get_object("remove_toolbutton").set_sensitive(True) ++ #self.builder.get_object("remove_toolbutton").set_sensitive(True) + elif dev_type == NM.DeviceType.WIFI: + notebook.set_current_page(1) + self.builder.get_object("button_wireless_options").set_sensitive(self.selected_ap is not None) +-- +1.8.3.1 + -- Gitee From 3185de01ae9667ba35c3f72f5736492ffafe5457 Mon Sep 17 00:00:00 2001 From: songnannan Date: Mon, 30 Dec 2019 15:14:19 +0800 Subject: [PATCH 2/2] init --- bugfix-disable-adding-virtual-device-in-network-spokes.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bugfix-disable-adding-virtual-device-in-network-spokes.patch b/bugfix-disable-adding-virtual-device-in-network-spokes.patch index 5a1096b..5414d69 100644 --- a/bugfix-disable-adding-virtual-device-in-network-spokes.patch +++ b/bugfix-disable-adding-virtual-device-in-network-spokes.patch @@ -1,5 +1,5 @@ From 234cfa065b655448f94e63ab1e80e0cb8cf3e94e Mon Sep 17 00:00:00 2001 -From: songnannan +From: fengtao Date: Mon, 30 Dec 2019 14:38:08 +0800 Subject: [PATCH] disable adding virtual device in network spokes -- Gitee