Hello community, here is the log from the commit of package yast2-firstboot checked in at Wed Jul 16 00:58:06 CEST 2008. -------- --- yast2-firstboot/yast2-firstboot.changes 2008-03-17 11:12:51.000000000 +0100 +++ yast2-firstboot/yast2-firstboot.changes 2008-07-15 12:49:06.941247000 +0200 @@ -1,0 +2,8 @@ +Tue Jul 15 10:17:32 CEST 2008 - jsuchome@suse.cz + +- added default location of Novell license texts (fate#304865) +- enabled license clients by default +- adapted documentation +- 2.17.0 + +------------------------------------------------------------------- Old: ---- yast2-firstboot-2.16.4.tar.bz2 New: ---- yast2-firstboot-2.17.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.G32001/_old 2008-07-16 00:55:58.000000000 +0200 +++ /var/tmp/diff_new_pack.G32001/_new 2008-07-16 00:55:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-firstboot (Version 2.16.4) +# spec file for package yast2-firstboot (Version 2.17.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,12 +13,12 @@ Url: http://www.suse.com/ Name: yast2-firstboot -Version: 2.16.4 +Version: 2.17.0 Release: 1 License: GPL v2 or later; X11/MIT Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firstboot-2.16.4.tar.bz2 +Source0: yast2-firstboot-2.17.0.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-testsuite yast2-xml # Internet.ycp moved to yast2.rpm @@ -52,7 +52,7 @@ Anas Nashif<nashif@suse.de> %prep -%setup -n yast2-firstboot-2.16.4 +%setup -n yast2-firstboot-2.17.0 %build %{prefix}/bin/y2tool y2autoconf @@ -98,6 +98,11 @@ %doc %{prefix}/share/doc/packages/yast2-firstboot /etc/YaST2/*.xml %changelog +* Tue Jul 15 2008 jsuchome@suse.cz +- added default location of Novell license texts (fate#304865) +- enabled license clients by default +- adapted documentation +- 2.17.0 * Mon Mar 17 2008 jsrain@suse.cz - adapted documentation regarding enabling firstboot service, removed /etc/init.d/firstboot (bnc#354738) @@ -193,5 +198,5 @@ * Tue Jul 27 2004 nashif@suse.de - Added missing help texts - adapted neededforbuild -* Mon Jul 12 2004 nashif@suse.de +* Tue Jul 13 2004 nashif@suse.de - initial version. (#43318) ++++++ yast2-firstboot-2.16.4.tar.bz2 -> yast2-firstboot-2.17.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.16.4/configure.in new/yast2-firstboot-2.17.0/configure.in --- old/yast2-firstboot-2.16.4/configure.in 2008-03-17 11:11:23.000000000 +0100 +++ new/yast2-firstboot-2.17.0/configure.in 2008-07-15 11:36:22.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.in for yast2-firstboot dnl -dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-firstboot, 2.16.4, http://bugs.opensuse.org/, yast2-firstboot) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.16.4/doc/firstboot-section_mod.xml new/yast2-firstboot-2.17.0/doc/firstboot-section_mod.xml --- old/yast2-firstboot-2.16.4/doc/firstboot-section_mod.xml 2008-03-17 11:05:20.000000000 +0100 +++ new/yast2-firstboot-2.17.0/doc/firstboot-section_mod.xml 2008-07-15 09:43:39.000000000 +0200 @@ -127,7 +127,7 @@ </listitem> </itemizedlist> <para>To do this, change the values of the respective variables - (FIRSTBOOT_WELCOME_DIR, FIRSTBOOT_WELCOME_PATTERNS, FIRSTBOOT_LICENSE_DIR, and + (FIRSTBOOT_WELCOME_DIR, FIRSTBOOT_WELCOME_PATTERNS, FIRSTBOOT_LICENSE_DIR, FIRSTBOOT_NOVELL_LICENSE_DIR, and FIRSTBOOT_FINISH_FILE). This will give you dialogs with customized text. If the references files are in plain text, they will be shown as such automatically. If they contain any markup language, they will @@ -139,7 +139,7 @@ </para> <para> - The license is read from file 'license.txt' or from 'license_<locale>.txt'. + The license is read from file 'license.txt' or from 'license_<locale>.txt'. The license texts of the Novell base product are by default installed to the directory /etc/YaST2/licenses/base/, set different value to FIRSTBOOT_NOVELL_LICENSE_DIR if they are elsewhere. Use FIRSTBOOT_LICENSE_DIR to indicate a path to directory containing vendor licence texts; it is preferred to put these license texts into another subdirectory of /etc/YaST2/licenses/. </para> </section> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.16.4/firstboot.pot new/yast2-firstboot-2.17.0/firstboot.pot --- old/yast2-firstboot-2.16.4/firstboot.pot 2008-03-14 09:55:33.000000000 +0100 +++ new/yast2-firstboot-2.17.0/firstboot.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,194 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-14 09:55+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/Firstboot.ycp:30 -msgid "No Text Available" -msgstr "" - -#: src/firstboot_config.ycp:27 -msgid "Empty" -msgstr "" - -#: src/firstboot_config.ycp:28 -msgid "Enabled" -msgstr "" - -#: src/firstboot_config.ycp:29 -msgid "Disabled" -msgstr "" - -#: src/firstboot_config.ycp:50 -msgid "Help" -msgstr "" - -#: src/firstboot_config.ycp:53 -msgid "First Boot Configuration" -msgstr "" - -#: src/firstboot_config.ycp:55 -msgid "&Up" -msgstr "" - -#: src/firstboot_config.ycp:56 -msgid "D&own" -msgstr "" - -#: src/firstboot_config.ycp:57 -msgid "Enab&le or Disable" -msgstr "" - -#: src/firstboot_config.ycp:63 -msgid "Step" -msgstr "" - -#: src/firstboot_config.ycp:63 -msgid "Label" -msgstr "" - -#: src/firstboot_config.ycp:63 -msgid "Module Name" -msgstr "" - -#: src/firstboot_config.ycp:63 -msgid "Status" -msgstr "" - -#. translators: dialog text -#: src/firstboot_desktop.ycp:73 -msgid "" -"Select the desktop environment \n" -"to use from the list below.\n" -msgstr "" - -#. help text fro desktop dialog -#: src/firstboot_desktop.ycp:89 -msgid "" -"<p><h3>Desktop Selections</h3>\n" -"This system has more than one desktop environment installed. Select\n" -"the desktop to enable as the default desktop.</p>" -msgstr "" - -#. translators: dialog title -#: src/firstboot_desktop.ycp:94 -msgid "Select Your Default Desktop" -msgstr "" - -#: src/firstboot_finish.ycp:42 -msgid "&Start YaST Control Center" -msgstr "" - -#. caption for dialog "Congratulation Dialog" -#: src/firstboot_finish.ycp:46 -msgid "Configuration Completed" -msgstr "" - -#. congratulation text 1/4 -#: src/firstboot_finish.ycp:49 -msgid "<p><b>Congratulations!</b></p>" -msgstr "" - -#. congratulation text 2/4 -#: src/firstboot_finish.ycp:52 -msgid "" -"<p>The installation of &product; on your machine is complete.\n" -"After clicking <b>Finish</b>, you can log in to the system.</p>\n" -msgstr "" - -#. congratulation text 3/4 -#. Translators: If there exists a SuSE web-page for your language -#. change the address accordingly. If in doubt leave the original. -#: src/firstboot_finish.ycp:59 -msgid "<p>Visit us at www.suse.com.</p>" -msgstr "" - -#. congratulation text 4/4 -#: src/firstboot_finish.ycp:62 -msgid "<p>Have a lot of fun!<br>Your SuSE Development Team</p>" -msgstr "" - -#. help 1/4 for dialog "Congratulation Dialog" -#: src/firstboot_finish.ycp:81 -msgid "<p>Your system is ready for use.</p>" -msgstr "" - -#. help 2/4 for dialog "Congratulation Dialog" -#: src/firstboot_finish.ycp:84 -msgid "" -"<p><b>Finish</b> will close the YaST installation and continue\n" -"to the login screen.</p>\n" -msgstr "" - -#. help 3/4 for dialog "Congratulation Dialog" -#: src/firstboot_finish.ycp:89 -msgid "" -"<p>If you choose the default graphical desktop KDE, you can\n" -"adjust some KDE settings to your hardware. Also notice\n" -"our SuSE Welcome Dialog.</p>\n" -msgstr "" - -#. help 4/4 for dialog "Congratulation Dialog" -#: src/firstboot_finish.ycp:97 -msgid "" -"<p>If desired, experts can use the full range of SuSE's configuration\n" -"modules at this time. Check <b>Start YaST Control Center</b> and it will start\n" -"after <b>Finish</b>. Note: The Control Center does not have a back button to\n" -"return to this installation sequence.</p>\n" -msgstr "" - -#. popup text -#: src/firstboot_language.ycp:100 -msgid "" -"Your language setting has been changed.\n" -"\n" -"If necessary, you may want to adapt your keyboard settings to the new\n" -"language. This is possible either in the YaST2 Control Center or by \n" -"starting "yast2 keyboard" directly." -msgstr "" - -#. progress stages -#: src/firstboot_write.ycp:20 -msgid "Update configuration" -msgstr "" - -#. progress stages -#: src/firstboot_write.ycp:22 -msgid "Prepare system for first login" -msgstr "" - -#. progress stages -#: src/firstboot_write.ycp:28 -msgid "Updating configuration..." -msgstr "" - -#. progress stages -#: src/firstboot_write.ycp:30 -msgid "Preparing system for first login..." -msgstr "" - -#. Help text for last dialog of base installation -#: src/firstboot_write.ycp:35 -msgid "" -"<p>\n" -"Please wait while the system is being configured.\n" -"</p>" -msgstr "" - -#. Headline for last dialog of first boot workflow -#: src/firstboot_write.ycp:44 -msgid "Completing the System Configuration" -msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.16.4/scripts/YaST2.Firstboot new/yast2-firstboot-2.17.0/scripts/YaST2.Firstboot --- old/yast2-firstboot-2.16.4/scripts/YaST2.Firstboot 2007-05-18 10:07:02.000000000 +0200 +++ new/yast2-firstboot-2.17.0/scripts/YaST2.Firstboot 2008-07-15 09:27:23.000000000 +0200 @@ -10,8 +10,8 @@ # : # BELONGS TO : System installation and Administration # : -# DESCRIPTION : This is the firstboot stage which is triggered if empty file -# : /etc/reconfig_system exists. +# DESCRIPTION : This is the firstboot stage which is triggered if file +# : /var/lib/YaST2/reconfig_system exists. # : # STATUS : $Id: YaST2.Firstboot 21252 2005-02-06 06:35:22Z nashif $ #---------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.16.4/src/control/firstboot.xml new/yast2-firstboot-2.17.0/src/control/firstboot.xml --- old/yast2-firstboot-2.16.4/src/control/firstboot.xml 2007-05-18 10:07:02.000000000 +0200 +++ new/yast2-firstboot-2.17.0/src/control/firstboot.xml 2008-07-15 09:36:15.000000000 +0200 @@ -4,7 +4,7 @@ xmlns:config="http://www.suse.com/1.0/configns"> <!-- - $Id: firstboot.xml 35107 2007-01-05 13:42:18Z jsrain $ + $Id: firstboot.xml 49062 2008-07-14 14:39:52Z locilka $ Work around for the text domain textdomain="firstboot" --> @@ -53,6 +53,12 @@ </module> <module> <label>License Agreement</label> + <enabled config:type="boolean">true</enabled> + <name>firstboot_license_novell</name> + </module> + <module> + <label>License Agreement</label> + <enabled config:type="boolean">true</enabled> <name>firstboot_license</name> </module> <module> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.16.4/src/data/sysconfig.firstboot new/yast2-firstboot-2.17.0/src/data/sysconfig.firstboot --- old/yast2-firstboot-2.16.4/src/data/sysconfig.firstboot 2007-10-23 10:34:46.000000000 +0200 +++ new/yast2-firstboot-2.17.0/src/data/sysconfig.firstboot 2008-07-14 13:53:10.000000000 +0200 @@ -31,6 +31,8 @@ ## Default: "" # # Directory from which 'license.txt' and 'license_<locale>.txt' are read +# This is Novell specific license of the base product installed, it should +# be already present on the system FIRSTBOOT_NOVELL_LICENSE_DIR="" ## Type: string diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.16.4/src/firstboot_license_novell.ycp new/yast2-firstboot-2.17.0/src/firstboot_license_novell.ycp --- old/yast2-firstboot-2.16.4/src/firstboot_license_novell.ycp 2007-10-23 10:34:46.000000000 +0200 +++ new/yast2-firstboot-2.17.0/src/firstboot_license_novell.ycp 2008-07-15 09:26:37.000000000 +0200 @@ -11,13 +11,23 @@ import "Misc"; import "GetInstArgs"; - + import "ProductFeatures"; any result = nil; map args = GetInstArgs::argmap(); - args["directory"] = Misc::SysconfigRead(.sysconfig.firstboot.FIRSTBOOT_NOVELL_LICENSE_DIR, ""); - args["action"] = Misc::SysconfigRead(.sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort"); + + // default directory with Novell license texts + string default_dir = ProductFeatures::GetStringFeature ("globals", + "base_product_license_directory"); + + args["directory"] = Misc::SysconfigRead ( + .sysconfig.firstboot.FIRSTBOOT_NOVELL_LICENSE_DIR, default_dir); + if (args["directory"]:"" == "") + args["directory"] = default_dir; + + args["action"] = Misc::SysconfigRead ( + .sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort"); y2milestone("inst_license options: %1", args); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.16.4/src/firstboot_license.ycp new/yast2-firstboot-2.17.0/src/firstboot_license.ycp --- old/yast2-firstboot-2.16.4/src/firstboot_license.ycp 2007-05-18 10:07:02.000000000 +0200 +++ new/yast2-firstboot-2.17.0/src/firstboot_license.ycp 2008-07-14 14:16:55.000000000 +0200 @@ -1,15 +1,8 @@ /* - * - * Module: firstboot_timezone.ycp - * - * Author: Ladislav Slezak <lslezak@suse.cz> - * - * Submodules: - * - * - * Purpose: display a license in running system - * - * + * Module : Firstboot configuration + * File : firstboot_license_novell.ycp + * Author : Ladislav Slezak <lslezak@suse.cz>, + * Purpose : Display vendor license during firstboot configuration * * $Id:$ */ @@ -29,9 +22,6 @@ y2milestone("inst_license options: %1", args); -// currently the pattern is hardcoded in ProductLicense::AskLicenseAgreement() function to license.txt and license_%1.txt -// args["patterns"] = [Misc::SysconfigRead(.sysconfig.firstboot.directory, "eula.txt")]; - result = WFM::CallFunction( "inst_license", [ args ] ); if (result == `halt) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.16.4/VERSION new/yast2-firstboot-2.17.0/VERSION --- old/yast2-firstboot-2.16.4/VERSION 2008-03-17 11:05:55.000000000 +0100 +++ new/yast2-firstboot-2.17.0/VERSION 2008-07-15 11:38:46.000000000 +0200 @@ -1 +1 @@ -2.16.4 +2.17.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org