no_comment

1 files changed, 103 insertions, 5 deletions

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d8c73efb6..6af11f58b 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -67,9 +67,105 @@ translated etc. that varies from language to language).") if $o->{lang} !~ /^en/
     
     unless ($o->{useless_thing_accepted}) {
 	$o->set_help('license');
-	$o->{useless_thing_accepted} = $o->ask_from_list_('', 
-							  "License - no warranty", 
-							  [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or $o->exit;
+	$o->{useless_thing_accepted} = $o->ask_from_list_('', formatAlaTeX(
+_(" Introduction
+------------
+The operating system and the different components available in the Linux-Mandrake distribution 
+shall be called the \"Software Products\" hereafter. The Software Products include, but are not 
+restricted to, the set of programs, methods, rules and documentation related to the operating 
+system and the different components of the Linux-Mandrake distribution.
+
+1. License Agreement
+--------------------
+Please read carefully this document. This document is a license agreement between you and  
+MandrakeSoft S.A., 42, rue d'Aboukir, 75002 Paris - France, which applies to the Software Products.
+By installing, duplicating or using the Software Products in any manner, you explicitly 
+accept and fully agree to conform to the terms and conditions of this License. 
+If you disagree with any portion of the License, you are not allowed to install, duplicate or use 
+the Software Products. 
+Any attempt to install, duplicate or use the Software Products in a manner which does not comply 
+with the terms and conditions of this License is void and will terminate your rights under this 
+License. Upon termination of the License,  you must immediately destroy all copies of the 
+Software Products.
+
+2. The GPL License and Related Licenses
+---------------------------------------
+The Software Products consist of components created by different persons or entities.  Most 
+of these components are governed under the terms and conditions of the GNU General Public 
+Licence, hereafter called \"GPL\", or of similar licenses. Most of these licenses allow you to use, 
+duplicate, adapt or redistribute the components which they cover. Please read carefully the terms 
+and conditions of the license agreement for each component before using any component. Any question 
+on a component license should be addressed to the component author and not to MandrakeSoft.
+The programs developed by MandrakeSoft S.A. are governed by the GPL License. Documentation written 
+by MandrakeSoft S.A. is governed by a specific license. Please refer to the documentation for 
+further details.
+Some versions of the Software Products may contain components which are not governed by the GPL 
+License or similar agreements. Each such component is then governed by the terms and conditions 
+of its own specific license. Please read carefully and comply with such specific licenses before 
+you install, use or redistribute the said components. Such licenses will in general prevent the 
+transfer,  duplication (except for backup purposes), redistribution, reverse engineering, 
+de-assembly, 
+de-compilation or modification of the component. Any breach of agreement will immediately terminate 
+your rights under the specific license. Unless the specific license terms grant you such rights, 
+you usually cannot install the programs on more than one system, or adapt it to be used on a 
+network. 
+In doubt, please contact directly the distributor or editor of the component. Transfer to third 
+parties or copying of such components including the documentation is usually forbidden.
+
+3. Intellectual Property Rights
+-------------------------------
+All rights to the components of the Software Products belong to their respective authors and are 
+protected by intellectual property and copyright laws applicable to software programs.
+MandrakeSoft S.A. reserves its rights to modify or adapt the Software Products, as a whole or in 
+parts,
+by all means and for all purposes.
+\"Mandrake\", \"Linux-Mandrake\" and associated logos are trademarks of MandrakeSoft S.A.  All rights 
+are 
+reserved. The duplication is forbidden without prior written consent by MandrakeSoft S.A.
+
+4. Limited Warranty
+-------------------
+The Software Products and attached documentation are provided \"as is\", with no warranty, to the 
+extent permitted by law. Should the Software Products be defective, MandrakeSoft S.A. will at its 
+own will either replace the Software Products, or reimburse the paid fee.
+This limited warranty is void if you fail to comply to the recommendations, instructions and 
+conditions 
+of use listed in the documentation or license agreements of the Software Products.
+To the extent permitted by law, MandrakeSoft S.A. will in no circumstances be liable for any 
+special, 
+incidental, direct or indirect damages whatsoever (including without limitation damages for loss of 
+business, interruption of business, financial loss, legal fees and penalties resulting from a court 
+judgement, or any other consequential loss) arising out of  the use or inability to use the 
+Software 
+Products, even if MandrakeSoft S.A. has been advised of the possibility or occurance of such 
+damages.
+
+LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES
+
+To the extent permitted by law, MandrakeSoft S.A. or its distributors will, in no circumstances, be 
+liable for any special, incidental, direct or indirect damages whatsoever (including without 
+limitation 
+damages for loss of business, interruption of business, financial loss, legal fees and penalties 
+resulting from a court judgement, or any other consequential loss) arising out of the possession 
+and 
+use of software components or arising out of  downloading software components from one of 
+Linux-Mandrake 
+sites  which are prohibited or restricted in some countries by local laws. This limited liability 
+applies to, but is not restricted to, the strong cryptography components included in the Software 
+Products.
+
+5. Governing Laws 
+-----------------
+If any portion of this agreement is held void, illegal or inapplicable by a court judgement, this 
+portion is excluded from this contract. You remain bound by the other applicable sections of the 
+agreement.
+The terms and conditions of this License are governed by the Laws of France.
+All disputes on the terms of this license will preferably be settled out of court. As a last 
+resort, 
+the dispute will be referred to the appropriate Courts of Law of Paris - France.
+For any question on this document, please contact MandrakeSoft S.A.,  
+42, rue d'Aboukir, 75002 Paris - France
+")), [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or $o->exit;
     }
 }
 #------------------------------------------------------------------------------
@@ -116,9 +212,11 @@ sub selectInstallClass($@) {
       $::corporate ? () : (
 	_("Recommended") => "beginner",
       ),
+      $o->{meta_class} eq 'desktop' ? () : (
 	_("Customized")  => "specific",
 	_("Expert")	 => "expert",
-    );
+      ),
+    );    
 
     $o->set_help('selectInstallClassCorpo') if $::corporate;
 
@@ -306,7 +404,7 @@ sub choosePartitionsToFormat($$) {
     $_->{toFormat} = 1 foreach @$toFormat;
 
     my @m = grep { $_->{toFormat} && !isLoopback($_) && !isReiserfs($_) } @l;
-    @m && $o->ask_many_from_list('', _("Check bad blocks?"),
+    !@m || $o->ask_many_from_list('', _("Check bad blocks?"),
         { 
           list => \@m,
           label => $name2label,