Attachment 521560 Details for Bug 798348

[patch] yast2-network-2.24.12: merged prototype patch to use network.service instead NETWORKMANAGER

yast2-network-2.24.12.diff (text/plain), 2.46 KB, created by Marius Tomaschewski on 2013-01-23 12:07:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Tomaschewski

Created: 2013-01-23 12:07:36 UTC

Size: 2.46 KB

patch

obsolete

>From 80170c268dbf930eb0bbd70664bd3c5af22ebaa2 Mon Sep 17 00:00:00 2001
>From: Marius Tomaschewski <mt@suse.de>
>Date: Wed, 23 Jan 2013 12:14:32 +0100
>Subject: [PATCH] Prototype: Changed to use network.service alias
>
>Adopted to reload using NetworkService instead Service, which has been
>changed to use network.service alias installed by the NetworkManager
>service file while "systemctl enable" and catched the service switch.
>Obsoletes the use of the NETWORKMANAGER=yes/no sysconfig variable in
>/etc/sysconfig/network/config (bnc#764055,bnc#764336,bnc#798348).
>---
> src/modules/Lan.ycp |   13 ++++++-------
> 1 Datei geÃ¤ndert, 6 Zeilen hinzugefÃ¼gt(+), 7 Zeilen entfernt(-)
>
>diff --git a/src/modules/Lan.ycp b/src/modules/Lan.ycp
>index 1d610e6..3f0bb5e 100644
>--- a/src/modules/Lan.ycp
>+++ b/src/modules/Lan.ycp
>@@ -123,7 +123,7 @@ global list<string> bond_autoconf_slaves = [];
>  */
> global boolean Modified() {
>     boolean ret  = LanItems::GetModified() || DNS::modified || Routing::Modified() ||
>-	NetworkConfig::Modified();
>+	NetworkConfig::Modified() || NetworkService::Modified();
>     return ret;
> }
> 
>@@ -522,6 +522,7 @@ global define boolean Write() {
>      if(Abort()) return false;
>      /* Progress step 9 */
>      ProgressNextStage(_("Activating network services..."));
>+     NetworkService::ReloadOrRestart();
>    // during installation export sysconfig settings into NetworkManager (bnc#433084)
>    if (Mode::installation() && NetworkService::IsManaged()) y2internal("Export sysconfig settings into NetworkManager %1", SCR::Execute(.target.bash_output, "/usr/lib/NetworkManager/nm-opensuse-sysconfig-merge --connections"));
> 
>@@ -556,7 +557,7 @@ y2internal("virt_net_proposal %1", virt_net_proposal);
>     any ret = UI::TimeoutUserInput(10*1000);
> 	if (ret==`ok){
> 	 y2internal("Restarting network because of bridged proposal");
>-	 Service::Restart("network");
>+	 NetworkService::ReloadOrRestart();
> 	}
>      UI::CloseDialog();
>     }
>@@ -565,11 +566,9 @@ y2internal("virt_net_proposal %1", virt_net_proposal);
>     else if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) 
> 	y2milestone("For ssh or vnc installation don't reload/restart network during installation.");
>     else if (LanItems::force_restart)
>-	Service::Restart("network");
>-    else if(Service::Status("network")==0){
>-	Service::Reload("network");
>-    }
>-    else Service::Restart("network");
>+	NetworkService::Restart();
>+    else
>+	NetworkService::ReloadOrRestart();
>     sleep(sl);
>     }
> 
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 798348: 520129 | 520659 | 520661 | 520665 | 520666 | 521559 | 521560 | 528381