Attachment 520661 Details for Bug 798348

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

yast2-network-2.24.10.diff (text/plain), 1.69 KB, created by Marius Tomaschewski on 2013-01-17 15:50:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Tomaschewski

Created: 2013-01-17 15:50:19 UTC

Size: 1.69 KB

patch

obsolete

>--- src/modules/Lan.ycp
>+++ src/modules/Lan.ycp	2013/01/17 15:36:35
>@@ -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_
>     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_
>     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);
>     }
>

Actions: View | Diff

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