Author: kmachalkova Date: Mon Sep 3 15:47:30 2007 New Revision: 40715 URL: http://svn.opensuse.org/viewcvs/yast?rev=40715&view=rev Log: Display 'ntpd started on boot' warning message only if we don't use NM and/or no network device is started at boot time (#299666) Modified: trunk/ntp-client/src/widgets.ycp Modified: trunk/ntp-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/widgets.ycp?rev=40715&r1=40714&r2=40715&view=diff ============================================================================== --- trunk/ntp-client/src/widgets.ycp (original) +++ trunk/ntp-client/src/widgets.ycp Mon Sep 3 15:47:30 2007 @@ -17,6 +17,7 @@ import "LogView"; import "SLPAPI"; import "NetworkDevices"; +import "NetworkService"; import "NtpClient"; import "CWMFirewallInterfaces"; import "Report"; @@ -107,11 +108,20 @@ */ define symbol startHandle (string id, map event) ``{ boolean start = UI::QueryWidget (`id ("start"), `CurrentButton) == "boot"; - list<string> devices = NetworkDevices::Locate ("STARTMODE", "onboot"); + //All these network devices are possibly started on boot || managed by NM + //hence do not display the message + list<string> d1 = NetworkDevices::Locate ("STARTMODE", "onboot"); + list<string> d2 = NetworkDevices::Locate ("STARTMODE", "auto"); + list<string> d3 = NetworkDevices::Locate ("STARTMODE", "nfsroot"); + list<string> d4 = NetworkDevices::Locate ("STARTMODE", "managed"); + + list<string> devices = (list <string>) union( union(d1,d2), union(d3,d4)); devices = filter (string d, devices, ``(d != "lo")); - if (start && size (devices) == 0 && event["EventReason"]:"" != "" + //Do not display this warning if we use NetworkManager (#299666) + if (start && !NetworkService::IsManaged() && size (devices) == 0 && + event["EventReason"]:"" != "" && // continue-cancel popup - && ! Popup::ContinueCancel (_("Warning! + ! Popup::ContinueCancel (_("Warning! If you do not have a permanent Internet connection, starting the NTP daemon can take a very long time and -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org