[yast-commit] r49092 - in /trunk/firstboot: ./ doc/ package/ scripts/ src/ src/control/ src/data/
Author: jsuchome
Date: Tue Jul 15 12:49:23 2008
New Revision: 49092
URL: http://svn.opensuse.org/viewcvs/yast?rev=49092&view=rev
Log:
- added default location of Novell license texts (fate#304865)
- enabled license clients by default
- adapted documentation
- 2.17.0
Modified:
trunk/firstboot/VERSION
trunk/firstboot/doc/firstboot-section_mod.xml
trunk/firstboot/package/yast2-firstboot.changes
trunk/firstboot/scripts/YaST2.Firstboot
trunk/firstboot/src/control/firstboot.xml
trunk/firstboot/src/data/sysconfig.firstboot
trunk/firstboot/src/firstboot_license.ycp
trunk/firstboot/src/firstboot_license_novell.ycp
Modified: trunk/firstboot/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=49092&r1=49091&r2=49092&view=diff
==============================================================================
--- trunk/firstboot/VERSION (original)
+++ trunk/firstboot/VERSION Tue Jul 15 12:49:23 2008
@@ -1 +1 @@
-2.16.4
+2.17.0
Modified: trunk/firstboot/doc/firstboot-section_mod.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/doc/firstboot-section_mod.xml?rev=49092&r1=49091&r2=49092&view=diff
==============================================================================
--- trunk/firstboot/doc/firstboot-section_mod.xml (original)
+++ trunk/firstboot/doc/firstboot-section_mod.xml Tue Jul 15 12:49:23 2008
@@ -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>
Modified: trunk/firstboot/package/yast2-firstboot.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboot.changes?rev=49092&r1=49091&r2=49092&view=diff
==============================================================================
--- trunk/firstboot/package/yast2-firstboot.changes (original)
+++ trunk/firstboot/package/yast2-firstboot.changes Tue Jul 15 12:49:23 2008
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------
Mon Mar 17 11:03:39 CET 2008 - jsrain@suse.cz
- adapted documentation regarding enabling firstboot service,
Modified: trunk/firstboot/scripts/YaST2.Firstboot
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/scripts/YaST2.Firstboot?rev=49092&r1=49091&r2=49092&view=diff
==============================================================================
--- trunk/firstboot/scripts/YaST2.Firstboot (original)
+++ trunk/firstboot/scripts/YaST2.Firstboot Tue Jul 15 12:49:23 2008
@@ -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$
#----------------
Modified: trunk/firstboot/src/control/firstboot.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/control/firstboot.xml?rev=49092&r1=49091&r2=49092&view=diff
==============================================================================
--- trunk/firstboot/src/control/firstboot.xml (original)
+++ trunk/firstboot/src/control/firstboot.xml Tue Jul 15 12:49:23 2008
@@ -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>
Modified: trunk/firstboot/src/data/sysconfig.firstboot
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/data/sysconfig.firstboot?rev=49092&r1=49091&r2=49092&view=diff
==============================================================================
--- trunk/firstboot/src/data/sysconfig.firstboot (original)
+++ trunk/firstboot/src/data/sysconfig.firstboot Tue Jul 15 12:49:23 2008
@@ -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
Modified: trunk/firstboot/src/firstboot_license.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_license.ycp?rev=49092&r1=49091&r2=49092&view=diff
==============================================================================
--- trunk/firstboot/src/firstboot_license.ycp (original)
+++ trunk/firstboot/src/firstboot_license.ycp Tue Jul 15 12:49:23 2008
@@ -1,15 +1,8 @@
/*
- *
- * Module: firstboot_timezone.ycp
- *
- * Author: Ladislav Slezak
participants (1)
-
jsuchome@svn.opensuse.org