Attachment 395950 Details for Bug 615146

[patch] patch for /usr/share/YaST2/clients/firstboot_finish.ycp

f (text/plain), 1016 bytes, created by Jiří Suchomel on 2010-10-20 11:47:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

Created: 2010-10-20 11:47:42 UTC

Size: 1016 bytes

patch

obsolete

>Index: firstboot_finish.ycp
>===================================================================
>--- firstboot_finish.ycp	(revision 62623)
>+++ firstboot_finish.ycp	(working copy)
>@@ -12,6 +12,7 @@
> {
>     textdomain "firstboot";
> 
>+    import "FileUtils";
>     import "Misc";
>     import "Mode";
>     import "Wizard";
>@@ -63,10 +64,15 @@
> 	_("<p>Have a lot of fun!<br>Your SuSE Development Team</p>");
> 
> 
>-    // If text exists, read it from file instead.
>-    string finish_text	= Misc::SysconfigRead (
>+    // If text exists, read it from file instead; it is expected to be richtext.
>+    string finish_text		= "";
>+    string finish_text_file	= Misc::SysconfigRead (
>         .sysconfig.firstboot.FIRSTBOOT_FINISH_FILE, "");
>-    if (finish_text == "")
>+    if (finish_text_file != "" && FileUtils::Exists (finish_text_file))
>+    {
>+	finish_text	= (string)SCR::Read (.target.string, finish_text_file);
>+    }
>+    if (finish_text == nil || finish_text == "")
> 	finish_text	= text;
> 
>     term contents = `VBox (

Actions: View | Diff

Attachments on bug 615146: 395950