Author: jsuchome Date: Wed Nov 3 17:09:56 2010 New Revision: 62742 URL: http://svn.opensuse.org/viewcvs/yast?rev=62742&view=rev Log: - fix FIRSTBOOT_FINISH_FILE behavior and documentation (bnc#615146) - 2.20.0 Modified: trunk/firstboot/VERSION trunk/firstboot/doc/firstboot-section_mod.xml trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/data/sysconfig.firstboot trunk/firstboot/src/firstboot_finish.ycp Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=62742&r1=62741&r2=62742&view=diff ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Wed Nov 3 17:09:56 2010 @@ -1 +1 @@ -2.19.5 +2.20.0 Modified: trunk/firstboot/doc/firstboot-section_mod.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/doc/firstboot-section_mod.xml?rev=62742&r1=62741&r2=62742&view=diff ============================================================================== --- trunk/firstboot/doc/firstboot-section_mod.xml (original) +++ trunk/firstboot/doc/firstboot-section_mod.xml Wed Nov 3 17:09:56 2010 @@ -147,8 +147,8 @@ </para> <para> - If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead - of inst_finish. The recommended way of customizing the congratulate text is specifying it in the firstboot.xml control file. + If you want to use FIRSTBOOT_FINISH_FILE, you need to update the firstboot workflow so that it calls firstboot_finish instead of inst_congratulate. The content of the given file would be shown as the final text. + However the recommended way of customizing the congratulate text is using default inst_congratulate step and specifying the text (as a value for 'congratulate' section) it in the firstboot.xml control file (see control.xml examples and documentation). </para> </section> Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboot.changes?rev=62742&r1=62741&r2=62742&view=diff ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Wed Nov 3 17:09:56 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 3 16:27:19 CET 2010 - jsuchome@suse.cz + +- fix FIRSTBOOT_FINISH_FILE behavior and documentation (bnc#615146) +- 2.20.0 + +------------------------------------------------------------------- Fri Apr 23 16:22:45 CEST 2010 - ug@suse.de - desktop file fixed Modified: trunk/firstboot/src/data/sysconfig.firstboot URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/data/sysconfig.firstboot?rev=62742&r1=62741&r2=62742&view=diff ============================================================================== --- trunk/firstboot/src/data/sysconfig.firstboot (original) +++ trunk/firstboot/src/data/sysconfig.firstboot Wed Nov 3 17:09:56 2010 @@ -46,9 +46,9 @@ ## Type: string ## Default: "" # -# finish text file +# finish text file, containing the finish text in richtext format # enable firstboot_finish instead of inst_finish in the control file -# preffered way is to define the text in the control file +# (but preffered way is to define the text in the control file) FIRSTBOOT_FINISH_FILE="" ## Type: yesno Modified: trunk/firstboot/src/firstboot_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_finish.ycp?rev=62742&r1=62741&r2=62742&view=diff ============================================================================== --- trunk/firstboot/src/firstboot_finish.ycp (original) +++ trunk/firstboot/src/firstboot_finish.ycp Wed Nov 3 17:09:56 2010 @@ -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 ( -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org