Hello community,
here is the log from the commit of package yast2-firstboot
checked in at Wed Nov 1 18:11:45 CET 2006.
--------
--- yast2-firstboot/yast2-firstboot.changes 2006-08-31 09:28:44.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-firstboot/yast2-firstboot.changes 2006-11-01 16:07:55.000000000 +0100
@@ -1,0 +2,17 @@
+Wed Nov 1 15:07:16 CET 2006 - lslezak@suse.cz
+
+- removed SLES9 license (#207283, #206540), removed other
+ useless message files
+- added firstboot_license client to display he license,
+ updated documentation (#206549)
+- halt the system if the license is not accepted and the action
+ is set to "halt" (#211118)
+- added firstboot_welcome client to display a welcome message
+- 2.13.4
+
+-------------------------------------------------------------------
+Mon Sep 25 13:44:07 CEST 2006 - jsrain@suse.cz
+
+- don't redirect stdout of YaST firstboot to /dev/null (#190287)
+
+-------------------------------------------------------------------
Old:
----
yast2-firstboot-2.13.3.tar.bz2
New:
----
yast2-firstboot-2.13.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.mU43Sx/_old 2006-11-01 18:11:33.000000000 +0100
+++ /var/tmp/diff_new_pack.mU43Sx/_new 2006-11-01 18:11:33.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-firstboot (Version 2.13.3)
+# spec file for package yast2-firstboot (Version 2.13.4)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-firstboot
URL: http://www.suse.com/
-Version: 2.13.3
+Version: 2.13.4
Release: 1
-License: X11/MIT, GPL
+License: GNU General Public License (GPL) - all versions, X11/MIT
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-firstboot-2.13.3.tar.bz2
+Source0: yast2-firstboot-2.13.4.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-network yast2-testsuite yast2-xml
Requires: yast2
@@ -43,7 +43,7 @@
Anas Nashif
%prep
-%setup -n yast2-firstboot-2.13.3
+%setup -n yast2-firstboot-2.13.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,7 +83,6 @@
%dir /usr/share/YaST2/include/firstboot
/usr/share/YaST2/include/firstboot/*.ycp
/usr/share/YaST2/modules/Firstboot.*
-/usr/share/YaST2/data/*
/usr/share/YaST2/scrconf/*.scr
/etc/init.d/firstboot
/var/adm/fillup-templates/sysconfig.firstboot
@@ -92,6 +91,17 @@
/etc/YaST2/*.xml
%changelog -n yast2-firstboot
+* Wed Nov 01 2006 - lslezak@suse.cz
+- removed SLES9 license (#207283, #206540), removed other
+ useless message files
+- added firstboot_license client to display he license,
+ updated documentation (#206549)
+- halt the system if the license is not accepted and the action
+ is set to "halt" (#211118)
+- added firstboot_welcome client to display a welcome message
+- 2.13.4
+* Mon Sep 25 2006 - jsrain@suse.cz
+- don't redirect stdout of YaST firstboot to /dev/null (#190287)
* Thu Aug 31 2006 - lslezak@suse.cz
- the control file has been updated to the default
workflow (#200718)
++++++ yast2-firstboot-2.13.3.tar.bz2 -> yast2-firstboot-2.13.4.tar.bz2 ++++++
++++ 6021 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/Makefile.am new/yast2-firstboot-2.13.4/Makefile.am
--- old/yast2-firstboot-2.13.3/Makefile.am 2006-08-31 09:12:21.000000000 +0200
+++ new/yast2-firstboot-2.13.4/Makefile.am 2006-11-01 15:33:30.000000000 +0100
@@ -67,7 +67,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/Makefile.am.common new/yast2-firstboot-2.13.4/Makefile.am.common
--- old/yast2-firstboot-2.13.3/Makefile.am.common 2006-08-31 09:12:21.000000000 +0200
+++ new/yast2-firstboot-2.13.4/Makefile.am.common 2006-11-01 15:33:30.000000000 +0100
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/VERSION new/yast2-firstboot-2.13.4/VERSION
--- old/yast2-firstboot-2.13.3/VERSION 2006-08-31 09:12:17.000000000 +0200
+++ new/yast2-firstboot-2.13.4/VERSION 2006-11-01 15:46:24.000000000 +0100
@@ -1 +1 @@
-2.13.3
+2.13.4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/configure.in new/yast2-firstboot-2.13.4/configure.in
--- old/yast2-firstboot-2.13.3/configure.in 2006-08-31 09:12:21.000000000 +0200
+++ new/yast2-firstboot-2.13.4/configure.in 2006-11-01 15:33:30.000000000 +0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2-firstboot
dnl
-dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-firstboot, 2.13.3, http://bugs.opensuse.org/, yast2-firstboot)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/doc/firstboot-section_mod.xml new/yast2-firstboot-2.13.4/doc/firstboot-section_mod.xml
--- old/yast2-firstboot-2.13.3/doc/firstboot-section_mod.xml 2006-08-31 08:44:22.000000000 +0200
+++ new/yast2-firstboot-2.13.4/doc/firstboot-section_mod.xml 2006-11-01 15:30:19.000000000 +0100
@@ -133,16 +133,20 @@
</listitem>
</itemizedlist>
<para>To do this, change the values of the respective variables
- (FIRSTBOOT_WELCOME_FILE,FIRSTBOOT_LICENSE_FILE , and
- FIRSTBOOT_FINISH_FILE) to the full path of a plain or rich text
- formatted text file. This will give you dialogs with customized
+ (FIRSTBOOT_WELCOME_DIR, FIRSTBOOT_WELCOME_PATTERNS, FIRSTBOOT_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
be formatted as rich text.</para>
- <para>The default license text shown is taken from the file
- <filename>/var/lib/YaST2/info.txt</filename> which is the EULA of the
- product being installed.</para>
+ <para>
+ Variable FIRSTBOOT_WELCOME_DIR is path to the directory from which is the welcome message read,
+ FIRSTBOOT_WELCOME_PATTERNS is a list of patterns or filenames which contains the message.
+ </para>
+
+ <para>
+ The license is read from file 'license.txt' or from 'license_<locale>.txt'.
+ </para>
</section>
<section>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/scripts/firstboot new/yast2-firstboot-2.13.4/scripts/firstboot
--- old/yast2-firstboot-2.13.3/scripts/firstboot 2006-06-29 08:54:09.000000000 +0200
+++ new/yast2-firstboot-2.13.4/scripts/firstboot 2006-09-27 14:22:47.000000000 +0200
@@ -52,7 +52,7 @@
echo -n "Configuring System for the first time.. "
## Start daemon with startproc(8). If this fails
## the return value is set appropriately by startproc.
- /usr/lib/YaST2/startup/YaST2.Firstboot > /dev/null 2>&1
+ /usr/lib/YaST2/startup/YaST2.Firstboot 2>/dev/null
# Remember status and be verbose
rc_status -v
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/src/Makefile.am new/yast2-firstboot-2.13.4/src/Makefile.am
--- old/yast2-firstboot-2.13.3/src/Makefile.am 2006-08-30 12:55:57.000000000 +0200
+++ new/yast2-firstboot-2.13.4/src/Makefile.am 2006-11-01 14:42:18.000000000 +0100
@@ -8,6 +8,8 @@
firstboot_desktop.ycp \
firstboot_language.ycp \
firstboot_timezone.ycp \
+ firstboot_license.ycp \
+ firstboot_welcome.ycp \
firstboot.ycp
ynclude_DATA = \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/src/control/firstboot.xml new/yast2-firstboot-2.13.4/src/control/firstboot.xml
--- old/yast2-firstboot-2.13.3/src/control/firstboot.xml 2006-08-31 09:25:28.000000000 +0200
+++ new/yast2-firstboot-2.13.4/src/control/firstboot.xml 2006-11-01 16:01:26.000000000 +0100
@@ -4,17 +4,13 @@
xmlns:config="http://www.suse.com/1.0/configns">
<!--
- $Id: firstboot.xml 32643 2006-08-31 07:26:57Z lslezak $
+ $Id: firstboot.xml 33971 2006-11-01 15:01:23Z lslezak $
Work around for the text domain
textdomain="firstboot"
-->
<textdomain>firstboot</textdomain>
- <custom>
- abort
- /usr/lib/YaST2/info.txt
- </custom>
<proposals config:type="list">
<proposal>
<name>firstboot_hardware</name>
@@ -53,11 +49,11 @@
</module>
<module>
<label>Welcome</label>
- <name>inst_welcome</name>
+ <name>firstboot_welcome</name>
</module>
<module>
<label>License Agreement</label>
- <name>inst_license</name>
+ <name>firstboot_license</name>
</module>
<module>
<label>Network</label>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/src/data/Makefile.am new/yast2-firstboot-2.13.4/src/data/Makefile.am
--- old/yast2-firstboot-2.13.3/src/data/Makefile.am 2006-06-29 08:54:09.000000000 +0200
+++ new/yast2-firstboot-2.13.4/src/data/Makefile.am 2006-11-01 14:33:20.000000000 +0100
@@ -1,17 +1,9 @@
# Makefile.am for firstboot/src/data
-ydata_DATA = firstboot_license.txt \
- firstboot_welcome.txt \
- firstboot_finish.txt
-
-
fillupdir = /var/adm/fillup-templates/
fillup_DATA = sysconfig.firstboot
-
-
-
-EXTRA_DIST = $(ydata_DATA) $(fillup_DATA)
+EXTRA_DIST = $(fillup_DATA)
include $(top_srcdir)/Makefile.am.common
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/src/data/firstboot_finish.txt new/yast2-firstboot-2.13.4/src/data/firstboot_finish.txt
--- old/yast2-firstboot-2.13.3/src/data/firstboot_finish.txt 2006-06-29 08:54:09.000000000 +0200
+++ new/yast2-firstboot-2.13.4/src/data/firstboot_finish.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-<html>
-<h1>Enjoy The Novell Linux Desktop</h1>
-<p>Some more usefull text should come in here</p>
-<p>This text can be changes by editing the file
-<em>/usr/share/YaST2/data/firstboot_finish.txt</em></p>
-<p>If no markup language is detected, it will be shown as plain text, otherwise
-the page will be formatted according to the markup tags used.
-</p>
-</html>
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/src/data/firstboot_license.txt new/yast2-firstboot-2.13.4/src/data/firstboot_license.txt
--- old/yast2-firstboot-2.13.3/src/data/firstboot_license.txt 2006-06-29 08:54:09.000000000 +0200
+++ new/yast2-firstboot-2.13.4/src/data/firstboot_license.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,275 +0,0 @@
-SUSE LINUX Enterprise Server (SLES) 9
-Novell Software License Agreement
-
-PLEASE READ THIS AGREEMENT CAREFULLY. BY INSTALLING OR
-OTHERWISE USING THE SOFTWARE (INCLUDING ITS COMPONENTS), YOU
-AGREE TO THE TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE
-WITH THESE TERMS, DO NOT DOWNLOAD, INSTALL OR USE THE
-SOFTWARE AND, IF APPLICABLE, RETURN THE ENTIRE UNUSED
-PACKAGE TO THE RESELLER WITH YOUR RECEIPT FOR A REFUND. THE
-SOFTWARE MAY NOT BE SOLD, TRANSFERRED, OR FURTHER
-DISTRIBUTED WITHOUT PRIOR WRITTEN AUTHORIZATION FROM NOVELL.
-
-RIGHTS AND LICENSES
-
-This Novell Software License Agreement ("Agreement") is a
-legal agreement between You (an entity or a person) and
-Novell, Inc. ("Novell") with respect to the software
-product identified in the title of this Agreement, media (if
-any) and accompanying documentation (collectively the
-"Software").
-
-The Software is a collective work of Novell. You may make
-and use unlimited copies of the Software for Your
-distribution and use within Your Organization. The term
-"Organization" means a legal entity, excluding subsidiaries
-and affiliates with a separate existence for tax purposes or
-for legal personality purposes. An example of an
-Organization in the private sector would be a corporation,
-partnership, or trust, excluding any subsidiaries or
-affiliates of the organization with a separate tax
-identification number or company registration number. In the
-public sector, an example of Organization would be a
-specific goverment body or local goverment authority.
-
-The Software is a modular operating system. Most of the
-components are open source packages, developed
-independently, and accompanied by separate license terms.
-Your license rights with respect to individual components
-accompanied by separate license terms are defined by those
-terms; nothing in this Agreement shall restrict, limit, or
-otherwise affect any rights or obligations You may have, or
-conditions to which You may be subject, under such license
-terms.
-
-While the license terms for a component may authorize You to
-distribute the component, You may not use any Novell marks
-(e.g., SUSE and SUSE LINUX) in distributing the component,
-whether or not the component contains Novell marks.
-
-OTHER LICENSE TERMS AND RESTRICTIONS
-
-The Software is protected by the copyright laws and treaties
-of the United States ("U.S.") and other countries and is
-subject to the terms of this Agreement. The Software is
-licensed to You, not sold.
-
-The Software may be bundled with other software programs
-("Bundled Programs"). Your license rights with respect to
-Bundled Programs accompanied by separate license terms are
-defined by those terms; nothing in this Agreement shall
-restrict, limit, or otherwise affect any rights or
-obligations You may have, or conditions to which You may be
-subject, under such license terms.
-
-Novell reserves all rights not expressly granted to You. You
-may not: (1) reverse engineer, decompile, or disassemble the
-Software except and only to the extent it is expressly
-permitted by applicable law or the license terms
-accompanying a component of the Software; or (2) transfer
-the Software or Your license rights under this Agreement, in
-whole or in part.
-
-MAINTENANCE AND SUPPORT
-
-Your rights with respect to updates, patches, or other
-materials received under a subscription to a Novell
-maintenance program for the Software are defined by the
-relevant maintenance program terms.
-
-Novell has no obligation under this Agreement to provide
-maintenance or support for the Software. Depending on how
-You acquired the Software, You may have also acquired a
-maintenance subscription for the Software. For more
-information on Novell's current maintenance and support
-offerings, see http://support.novell.com.
-
-OWNERSHIP RIGHTS
-
-No title to or ownership of the Software is transferred to
-You. Novell and/or its licensors owns and retains all title
-and ownership of all intellectual property rights in the
-Software, including any adaptations or copies. You acquire
-only a license to use the Software.
-
-LIMITED WARRANTY
-
-For ninety (90) days from Your date of purchase, Novell
-warrants that (1) any media on which the Software is
-delivered is free from physical defects; and (2) the
-Software will substantially conform to the documentation
-accompanying the Software. If the defective items are
-returned to Novell or if You report the nonconformity to
-Novell within ninety (90) days from the date of purchase,
-Novell will at its sole discretion either resolve the
-nonconformity or refund the license fees You paid for the
-Software. Any misuse or unauthorized modification of the
-Software voids this warranty. THE FOREGOING WARRANTY IS YOUR
-SOLE AND EXCLUSIVE REMEDY AND IS IN LIEU OF ALL OTHER
-WARRANTIES, EXPRESS OR IMPLIED. (The foregoing warranty does
-not apply to Software provided free of charge. SUCH SOFTWARE
-IS PROVIDED "AS IS" WITHOUT ANY WARRANTIES OF ANY KIND.)
-
-THE SOFTWARE IS NOT DESIGNED, MANUFACTURED OR INTENDED FOR
-USE OR DISTRIBUTION WITH ON-LINE CONTROL EQUIPMENT IN
-HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE PERFORMANCE, SUCH
-AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT
-NAVIGATION, COMMUNICATION, OR CONTROL SYSTEMS, DIRECT LIFE
-SUPPORT MACHINES, WEAPONS SYSTEMS, OR OTHER USES IN WHICH
-FAILURE OF THE SOFTWARE COULD LEAD DIRECTLY TO DEATH,
-PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE.
-
-THE SOFTWARE IS ONLY COMPATIBLE WITH CERTAIN COMPUTERS AND
-OPERATING SYSTEMS. THE SOFTWARE IS NOT WARRANTED FOR
-NON-COMPATIBLE SYSTEMS. Call Novell or Your dealer for
-information about compatibility.
-
-Non-Novell Products. The Software may include or be bundled
-with hardware or other software programs licensed or sold by
-a licensor other than Novell. NOVELL DOES NOT WARRANT
-NON-NOVELL PRODUCTS. ANY SUCH PRODUCTS ARE PROVIDED ON AN
-"AS IS" BASIS. ANY WARRANTY SERVICE FOR NON-NOVELL PRODUCTS
-IS PROVIDED BY THE PRODUCT LICENSOR IN ACCORDANCE WITH THE
-APPLICABLE LICENSOR WARRANTY.
-
-EXCEPT AS OTHERWISE RESTRICTED BY LAW, NOVELL DISCLAIMS AND
-EXCLUDES ANY AND ALL IMPLIED WARRANTIES INCLUDING ANY
-WARRANTIES OF MERCHANTABILITY, TITLE, NON-INFRINGEMENT, OR
-FITNESS FOR A PARTICULAR PURPOSE. NOVELL MAKES NO WARRANTY,
-REPRESENTATION OR PROMISE NOT EXPRESSLY SET FORTH IN THIS
-LIMITED WARRANTY. NOVELL DOES NOT WARRANT THAT THE SOFTWARE
-WILL SATISFY YOUR REQUIREMENTS OR THAT THE OPERATION OF THE
-SOFTWARE WILL BE UNINTERRUPTED. Some jurisdictions do not
-allow certain disclaimers and limitations of warranties, so
-portions of the above limitations may not apply to You. This
-limited warranty gives You specific rights and You may also
-have other rights which vary from state to state.
-
-LIMITATION OF LIABILITY
-
-(a) Consequential Losses. NEITHER NOVELL NOR ANY OF ITS
-LICENSORS, SUBSIDIARIES, OR EMPLOYEES WILL IN ANY CASE BE
-LIABLE FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT,
-TORT, ECONOMIC OR PUNITIVE DAMAGES ARISING OUT OF THE USE OF
-OR INABILITY TO USE THE SOFTWARE, INCLUDING WITHOUT
-LIMITATION LOSS OF PROFITS, BUSINESS OR DATA, EVEN IF
-ADVISED OF THE POSSIBILITY OF THOSE DAMAGES.
-
-(b) Direct Damages. IN NO EVENT WILL NOVELL'S AGGREGATE
-LIABILITY FOR DIRECT DAMAGES TO PROPERTY OR PERSON (WHETHER
-IN ONE INSTANCE OR A SERIES OF INSTANCES) EXCEED 1.25 TIMES
-THE AMOUNT PAID BY YOU FOR THE SOFTWARE OUT OF WHICH SUCH
-CLAIM AROSE [OR $50 (U.S.) IF YOU RECEIVED THE SOFTWARE FREE
-OF CHARGE]. The above exclusions and limitations will not
-apply to claims relating to death or personal injury. In
-those jurisdictions that do not allow the exclusion or
-limitation of damages, Novell's liability shall be limited
-or excluded to the maximum extent allowed within those
-jurisdictions.
-
-GENERAL TERMS
-
-Term. This Agreement becomes effective on the date You
-legally acquire the Software and will automatically
-terminate if You breach any of its terms. Upon termination
-of this Agreement, You must destroy the original and all
-copies of the Software or return them to Novell and delete
-the Software from Your systems.
-
-Benchmark Testing. This benchmark testing restriction
-applies to You if You are a software vendor or if You are
-performing testing on the Software at the direction of or on
-behalf of a software vendor. You may not, without Novell's
-prior written consent not to be unreasonably withheld,
-publish or disclose to any third party the results of any
-benchmark test of the Software. If You are a vendor of
-products that are functionally similar to or compete with
-the Software ("Similar Products"), or are acting on behalf
-of such a vendor, and You publish or disclose benchmark
-information on the Software in violation of this
-restriction, then notwithstanding anything to the contrary
-in the Similar Product's end user license agreement, and in
-addition to any other remedies Novell may have, Novell shall
-have the right to perform benchmark testing on Similar
-Products and to disclose and publish that benchmark
-information and You hereby represent that You have authority
-to grant such right to Novell.
-
-Transfer. This Agreement may not be transferred or assigned
-without the prior written approval of Novell.
-
-Law and Jurisdiction. This Agreement is governed by the laws
-of the State of Utah, U.S. Any action at law relating to
-this Agreement may only be brought before the courts of
-competent jurisdiction of the State of Utah. If, however,
-Your country of principal residence is a member state of the
-European Union or the European Free Trade Association, this
-Agreement is governed by the laws of that country, and any
-action at law may only be brought before a court of
-competent jurisdiction of that country.
-
-Entire Agreement. This Agreement and the Upgrade/Additive
-Agreement (if applicable) sets forth the entire
-understanding and agreement between You and Novell and may
-be amended only in a writing signed by both parties. NO
-LICENSOR, DISTRIBUTOR, DEALER, RETAILER, RESELLER, SALES
-PERSON, OR EMPLOYEE IS AUTHORIZED TO MODIFY THIS AGREEMENT
-OR TO MAKE ANY REPRESENTATION OR PROMISE THAT IS DIFFERENT
-FROM, OR IN ADDITION TO, THE TERMS OF THIS AGREEMENT.
-
-Waiver. No waiver of any right under this Agreement will be
-effective unless in writing, signed by a duly authorized
-representative of the party to be bound. No waiver of any
-past or present right arising from any breach or failure to
-perform will be deemed to be a waiver of any future right
-arising under this Agreement.
-
-Severability. If any provision in this Agreement is invalid
-or unenforceable, that provision will be construed, limited,
-modified or, if necessary, severed, to the extent necessary,
-to eliminate its invalidity or unenforceability, and the
-other provisions of this Agreement will remain unaffected.
-
-Export Compliance. Any person or entity exporting or
-re-exporting Novell products directly or indirectly and via
-any means, including electronic transfer, is wholly
-responsible for doing so in accordance with the U.S. Export
-Administration Regulations and the laws of host countries.
-Novell assumes no responsibility or liability for your
-failure to obtain any necessary export approvals. Approvals
-are dependent upon an item's technical characteristics, the
-destination, end-use and end-user, as well as other
-activities of the end user. Specifically, no Novell product
-may be exported to embargoed or otherwise restricted
-countries or end users. Please consult the Bureau of
-Industry and Security web page and other sources before
-exporting Novell products from the U.S. and familiarize
-yourself with the laws of destination countries before
-re-exporting Novell products. This provision shall survive
-the expiration or earlier termination of this Agreement.
-Please refer to the export matrix for Novell products for
-more information on exporting Novell Software. You can
-download a copy from http://www.novell.com/info/exports/ or
-obtain a copy from your local Novell office.
-
-U.S. Government Restricted Rights. Use, duplication, or
-disclosure by the U.S. Government is subject to the
-restrictions in FAR 52.227-14 (June 1987) Alternate III
-(June 1987), FAR 52.227-19 (June 1987), or DFARS
-252.227-7013 (b)(3) (Nov 1995), or applicable successor
-clauses. Contractor/ Manufacturer is Novell, Inc., 1800
-South Novell Place, Provo, Utah 84606.
-
-Other. The application of the United Nations Convention of
-Contracts for the International Sale of Goods is expressly
-excluded.
-
-Copyright 1993, 2000-2004 Novell, Inc. All Rights Reserved.
-
-Novell is a registered trademark, and SUSE LINUX is
-registered trademark, and the SUSE logo is a trademark, of
-SUSE LINUX AG, a Novell company, in the United States and
-other countries. Linux is a registered trademark of Linus
-Torvalds.
-
-06/22/04
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/src/data/firstboot_welcome.txt new/yast2-firstboot-2.13.4/src/data/firstboot_welcome.txt
--- old/yast2-firstboot-2.13.3/src/data/firstboot_welcome.txt 2006-06-29 08:54:09.000000000 +0200
+++ new/yast2-firstboot-2.13.4/src/data/firstboot_welcome.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-<html>
-<h1>Finish System Configuration</h1>
-<p>Some more usefull text should come in here...</p>
-
-<h2>Novell Linux Desktop</h2>
-<ul>
-<li>A Linux desktop hardened in the Novell SuperLab
-<li>Builds on the combined strengths of SUSE LINUX, Ximian Desktop and Novell
-<li>Offers choice and flexibility, without sacrificing usability
-<li>Serviced and supported by Novell's world-class support and consulting
-operations
-<li>With tools for efficient deployment in corporate environments
-</ul>
-
-p>This text can be changes by editing the file
-<em>/usr/share/YaST2/data/firstboot_welcome.txt</em></p>
-<p>If no markup language is detected, it will be shown as plain text, otherwise
-the page will be formatted according to the markup tags used.
-</p>
-
-</html>
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/src/data/sysconfig.firstboot new/yast2-firstboot-2.13.4/src/data/sysconfig.firstboot
--- old/yast2-firstboot-2.13.3/src/data/sysconfig.firstboot 2006-06-29 08:54:09.000000000 +0200
+++ new/yast2-firstboot-2.13.4/src/data/sysconfig.firstboot 2006-11-01 15:05:00.000000000 +0100
@@ -10,14 +10,21 @@
## Type: string
## Default: ""
#
-# Welcome text file
-FIRSTBOOT_WELCOME_FILE=""
+# Directory from which 'welcome.txt' and 'welcome_<locale>.txt' are read
+FIRSTBOOT_WELCOME_DIR=""
## Type: string
-## Default: "/usr/share/YaST2/data/firstboot_license.txt"
+## Default: ""
+#
+# Pattern for the welcome message, if not set welcome.txt and welcome_<locale>.txt files are read
+# Use a comma (,) character as a separator if more than one pattern is required
+FIRSTBOOT_WELCOME_PATTERNS=""
+
+## Type: string
+## Default: ""
#
-# license text file
-FIRSTBOOT_LICENSE_FILE="/var/lib/YaST2/info.txt"
+# Directory from which 'license.txt' and 'license_<locale>.txt' are read
+FIRSTBOOT_LICENSE_DIR=""
## Type: string
## Default: ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/src/firstboot_license.ycp new/yast2-firstboot-2.13.4/src/firstboot_license.ycp
--- old/yast2-firstboot-2.13.3/src/firstboot_license.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-firstboot-2.13.4/src/firstboot_license.ycp 2006-11-01 14:53:14.000000000 +0100
@@ -0,0 +1,46 @@
+/*
+ *
+ * Module: firstboot_timezone.ycp
+ *
+ * Author: Ladislav Slezak
+ *
+ * Submodules:
+ *
+ *
+ * Purpose: display a license in running system
+ *
+ *
+ *
+ * $Id:$
+ */
+
+{
+ textdomain "firstboot";
+
+ import "Misc";
+ import "GetInstArgs";
+
+
+ any result = nil;
+
+ map args = GetInstArgs::argmap();
+ args["directory"] = Misc::SysconfigRead(.sysconfig.firstboot.FIRSTBOOT_LICENSE_DIR, "/etc/YaST2");
+ args["action"] = Misc::SysconfigRead(.sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort");
+
+ 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)
+ {
+ UI::CloseDialog();
+ y2milestone("Halting the system...");
+ SCR::Execute(.target.bash, "/sbin/halt");
+ }
+
+ return result;
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firstboot-2.13.3/src/firstboot_welcome.ycp new/yast2-firstboot-2.13.4/src/firstboot_welcome.ycp
--- old/yast2-firstboot-2.13.3/src/firstboot_welcome.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-firstboot-2.13.4/src/firstboot_welcome.ycp 2006-11-01 14:54:17.000000000 +0100
@@ -0,0 +1,48 @@
+/*
+ *
+ * Module: firstboot_welcome.ycp
+ *
+ * Author: Ladislav Slezak
+ *
+ * Submodules:
+ *
+ *
+ * Purpose: display a welcome message in running system
+ *
+ *
+ *
+ * $Id:$
+ */
+
+{
+ textdomain "firstboot";
+
+ import "Misc";
+ import "GetInstArgs";
+ import "Directory";
+
+
+ any result = nil;
+
+ map args = GetInstArgs::argmap();
+
+ string directory = Misc::SysconfigRead(.sysconfig.firstboot.FIRSTBOOT_WELCOME_DIR, "");
+ if (directory != "")
+ {
+ // set the prefix to root
+ Directory::custom_workflow_dir = "/";
+ args["directory"] = directory;
+ }
+
+ string patterns = Misc::SysconfigRead(.sysconfig.firstboot.FIRSTBOOT_WELCOME_PATTERNS, "");
+ if (patterns != "")
+ {
+ args["patterns"] = splitstring(patterns, ",");
+ }
+
+ y2milestone("inst_welcome options: %1", args);
+
+ result = WFM::CallFunction( "inst_welcome", [ args ] );
+
+ return result;
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org