Attachment 352598 Details for Bug 589296

[patch] patch for ntp-client_proposal.ycp

ntp-client_proposal.diff (text/plain), 1.75 KB, created by Jiří Suchomel on 2010-04-06 13:52:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

Created: 2010-04-06 13:52:45 UTC

Size: 1.75 KB

patch

obsolete

>Index: ntp-client_proposal.ycp
>===================================================================
>--- ntp-client_proposal.ycp	(revision 61590)
>+++ ntp-client_proposal.ycp	(working copy)
>@@ -219,6 +219,23 @@
>     return ret;
> }
> 
>+boolean WriteNtpSettings (string ntp_server) {
>+
>+    NtpClient::modified = true;
>+    AddSingleServer(ntp_server);
>+
>+    //OK, so we stored the server address
>+    //In inst-sys we don't need to care further
>+    //ntp-client_finish will do the job
>+    //In installed system we must write the settings
>+    if (!Stage::initial()) {
>+	Wizard::OpenAcceptDialog(); // FIXME so that the progress does not disturb the dialog to be returned to
>+        NtpClient::Write();
>+        Wizard::CloseDialog();
>+    }
>+    return true;
>+}
>+
> /*
> params:
>   server (taken from UI if empty)
>@@ -237,6 +254,12 @@
>     if ( !ValidateSingleServer( ntp_server ) )
> 	return `invalid_hostname;
> 
>+    if (param["write_only"]:false)
>+    {
>+	WriteNtpSettings (ntp_server);
>+	return `success;
>+    }
>+
>     // One-time adjusment without running the ntp daemon
>     // Meanwhile, ntpdate was replaced by sntp
>     boolean ntpdate_only = param["ntpdate_only"]:false;
>@@ -283,18 +306,7 @@
>     // User wants to more than running sntp (synchronize on boot)
>     if (!ntpdate_only)
>     {
>-	NtpClient::modified = true;
>-	AddSingleServer(ntp_server);
>-
>-	//OK, so we stored the server address
>-	//In inst-sys we don't need to care further
>-	//ntp-client_finish will do the job
>-	//In installed system we must write the settings
>-	if (!Stage::initial()) {
>-	    Wizard::OpenAcceptDialog(); // FIXME so that the progress does not disturb the dialog to be returned to
>-	    NtpClient::Write();
>-	    Wizard::CloseDialog();
>-	}
>+	WriteNtpSettings (ntp_server);
>     }
> 
>     return `success;

Actions: View | Diff

Attachments on bug 589296: 350850 | 352598