|
Line
Link Here
|
|
-- src/modules/Lan.ycp |
|
|
|
Lines 123-129
global list<string> bond_autoconf_slaves
Link Here
|
| 123 |
*/ |
123 |
*/ |
| 124 |
global boolean Modified() { |
124 |
global boolean Modified() { |
| 125 |
boolean ret = LanItems::GetModified() || DNS::modified || Routing::Modified() || |
125 |
boolean ret = LanItems::GetModified() || DNS::modified || Routing::Modified() || |
| 126 |
NetworkConfig::Modified(); |
126 |
NetworkConfig::Modified() || NetworkService::Modified(); |
| 127 |
return ret; |
127 |
return ret; |
| 128 |
} |
128 |
} |
| 129 |
|
129 |
|
|
Lines 522-527
global define boolean Write() {
Link Here
|
| 522 |
if(Abort()) return false; |
522 |
if(Abort()) return false; |
| 523 |
/* Progress step 9 */ |
523 |
/* Progress step 9 */ |
| 524 |
ProgressNextStage(_("Activating network services...")); |
524 |
ProgressNextStage(_("Activating network services...")); |
|
|
525 |
NetworkService::ReloadOrRestart(); |
| 525 |
// during installation export sysconfig settings into NetworkManager (bnc#433084) |
526 |
// during installation export sysconfig settings into NetworkManager (bnc#433084) |
| 526 |
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")); |
527 |
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")); |
| 527 |
|
528 |
|
|
Lines 556-562
y2internal("virt_net_proposal %1", virt_
Link Here
|
| 556 |
any ret = UI::TimeoutUserInput(10*1000); |
557 |
any ret = UI::TimeoutUserInput(10*1000); |
| 557 |
if (ret==`ok){ |
558 |
if (ret==`ok){ |
| 558 |
y2internal("Restarting network because of bridged proposal"); |
559 |
y2internal("Restarting network because of bridged proposal"); |
| 559 |
Service::Restart("network"); |
560 |
NetworkService::ReloadOrRestart(); |
| 560 |
} |
561 |
} |
| 561 |
UI::CloseDialog(); |
562 |
UI::CloseDialog(); |
| 562 |
} |
563 |
} |
|
Lines 565-575
y2internal("virt_net_proposal %1", virt_
Link Here
|
| 565 |
else if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) |
566 |
else if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) |
| 566 |
y2milestone("For ssh or vnc installation don't reload/restart network during installation."); |
567 |
y2milestone("For ssh or vnc installation don't reload/restart network during installation."); |
| 567 |
else if (LanItems::force_restart) |
568 |
else if (LanItems::force_restart) |
| 568 |
Service::Restart("network"); |
569 |
NetworkService::Restart(); |
| 569 |
else if(Service::Status("network")==0){ |
570 |
else |
| 570 |
Service::Reload("network"); |
571 |
NetworkService::ReloadOrRestart(); |
| 571 |
} |
|
|
| 572 |
else Service::Restart("network"); |
| 573 |
sleep(sl); |
572 |
sleep(sl); |
| 574 |
} |
573 |
} |
| 575 |
|
574 |
|