no_comment

10 files changed, 109 insertions, 81 deletions

diff --git a/perl-install/Makefile b/perl-install/Makefile
index 67be5085a..9c936160b 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -34,7 +34,7 @@ verify_c:
 	./verify_c $(PMS)
 
 install_pms: $(DIRS)
-	for i in `perl -ne 's/sub (\w+?)_? {.*/$$1/ and print' commands.pm`; do ln -sf commands $(DEST)/usr/bin/$$i; done
+	for i in `perl -ne 's/sub (\w+?)_? {.*/$$1/ and print' commands.pm` sync; do ln -sf commands $(DEST)/usr/bin/$$i; done
 
 	install -d $(DESTREP4PMS)
 	for i in $(PMS); do \
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index c25b9ac9a..184c3d303 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -2,7 +2,7 @@ package Xconfigurator;
 
 use diagnostics;
 use strict;
-use vars qw($in $install $resolution_wanted @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $intro_text $finalcomment_text $s3_comment $cirrus_comment $probeonlywarning_text $monitorintro_text $hsyncintro_text $vsyncintro_text $XF86firstchunk_text $keyboardsection_start $keyboardsection_part2 $keyboardsection_end $pointersection_text1 $pointersection_text2 $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text $devicesection_text $screensection_text1 %lines @options %xkb_options);
+use vars qw($in $install $isLaptop $resolution_wanted @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $intro_text $finalcomment_text $s3_comment $cirrus_comment $probeonlywarning_text $monitorintro_text $hsyncintro_text $vsyncintro_text $XF86firstchunk_text $keyboardsection_start $keyboardsection_part2 $keyboardsection_end $pointersection_text1 $pointersection_text2 $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text $devicesection_text $screensection_text1 %lines @options %xkb_options);
 
 use pci_probing::main;
 use common qw(:common :file :functional :system);
@@ -71,7 +71,7 @@ sub readCardsDB {
 	/^$/ and next;
 	/^END/ and last;
 
-	($cmd, $val) = /(\S+)\s*(.*)/ or log::l("bad line $lineno ($_)"), next;
+	($cmd, $val) = /(\S+)\s*(.*)/ or next; #log::l("bad line $lineno ($_)"), next;
 
 	my $f = $fs->{$cmd};
 
@@ -140,6 +140,7 @@ sub cardConfigurationAuto() {
 	($card->{identifier}, $_) = @$c;
 	$card->{type} = $1 if /Card:(.*)/;
 	$card->{server} = $1 if /Server:(.*)/;
+	$card->{flags}{needVideoRam} &&= /86c368/;
 	push @{$card->{lines}}, @{$lines{$card->{identifier}} || []};
     }
     $card;
@@ -412,8 +413,9 @@ sub autoDefaultDepth($$) {
 }
 
 sub autoDefaultResolution {
-    my ($size, $isLaptop) = @_;
-    !$size && $isLaptop and return "1024x768";
+    return "1024x768" if $isLaptop;
+
+    my ($size) = @_;
     $monitorSize2resolution[round($size || 14)] || #- assume a small monitor (size is in inch)
       $monitorSize2resolution[-1]; #- no corresponding resolution for this size. It means a big monitor, take biggest we have
 }
@@ -555,7 +557,7 @@ Try with another video card or monitor")), return;
     #- remove unusable resolutions (based on the video memory size and the monitor hsync rate)
     keepOnlyLegalModes($card, $o->{monitor});
 
-    my $res = $o->{resolution_wanted} || autoDefaultResolution($o->{monitor}{size}, );
+    my $res = $o->{resolution_wanted} || autoDefaultResolution($o->{monitor}{size});
     my $wres = first(split 'x', $res);
     my $depth = eval { $card->{default_depth} || autoDefaultDepth($card, $wres) };
 
@@ -759,7 +761,7 @@ sub main {
 
 	$o->{monitor} = monitorConfiguration($o->{monitor}, $o->{card}{server} eq 'FBDev');
     }
-    my $ok = resolutionsConfiguration($o, auto => $::auto, noauto => $::noauto, isLaptop => $isLaptop);
+    my $ok = resolutionsConfiguration($o, auto => $::auto, noauto => $::noauto);
 
     $ok &&= testFinalConfig($o, $::auto, $::skiptest);
 
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index b2212955e..7e7c036f6 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -147,6 +147,7 @@ $resolution_wanted = "1024x768";
 %lines = (
 #-    'Cirrus Logic|GD 5446' => [ '	Option "no_bitblt"' ],
       'Silicon Integrated Systems [SiS]|86C326' => [ '	Option "noaccel"' ],
+      'S3 Inc.|86c368 [Trio 3D/2X]' => [ '	ChipID  0x8a10' ],
 );
 
 #- most usefull server options have to be accessible at the beginning, since
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index 320488197..fc4653b64 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -502,6 +502,30 @@ sub lspci {
 }
 sub dmesg { print cat_("/tmp/syslog"); }
 
+sub sort {
+    my ($n, $h) = getopts(\@_, qw(nh));
+    $h and die "usage: sort [-n] [<file>]\n";
+    local *F; @_ ? open(F, $_[0]) || die "error: can't open file $_[0]\n" : (*F = *STDIN);
+    if ($n) {
+	print sort { $a <=> $b } <F>;
+    } else {
+	print sort <F>;
+    }
+}
+
+sub du {
+    my ($s, $h) = getopts(\@_, qw(sh));
+    $h || !$s and die "usage: du -s [<directories>]\n";
+
+    my $f; $f = sub {
+	my ($e) = @_;
+	my $s = (lstat($e))[12];
+	$s += sum map { &$f($_) } glob_("$e/*") if !-l $e && -d $e;
+	$s;
+    };
+    print &$f($_) >> 1, "\t$_\n" foreach @_ ? @_ : glob_("*");
+}
+
 #my %cached_failed_install_cpio;
 #- double space between sub and install_cpio cuz install_cpio is not a shell command
 sub  install_cpio($$;@) {
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index c5f9e0c0b..08d7e0bc0 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -545,7 +545,7 @@ sub main {
     $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin:$o->{prefix}/sbin:$o->{prefix}/bin:$o->{prefix}/usr/sbin:$o->{prefix}/usr/bin:$o->{prefix}/usr/X11R6/bin" unless $::g_auto_install;
 
     $o->{interactive} ||= 'gtk';
-    if ($o->{interactive} eq "gtk" && availableMemory < 24 * 1024) {
+    if ($o->{interactive} eq "gtk" && availableMemory < 22 * 1024) {
 	log::l("switching to newt install cuz not enough memory");
 	$o->{interactive} = "newt";
     }
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 139ef21a8..11b9c56a2 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -595,34 +595,34 @@ sub kdeicons_postinstall($) {
     open F, "$prefix/etc/fstab" or log::l("failed to read $prefix/etc/fstab"), return;
 
     foreach (<F>) {
-	if (/^\/dev\/(\S+)\s+\/mnt\/cdrom (\d*)\s+/x) {
+	if (m|^/dev/(\S+)\s+/mnt/cdrom(\d*)\s+|) {
 	    my %toreplace = ( device => $1, id => $2 );
 	    template2userfile($prefix, "/usr/share/cdrom.fsdev.kdelnk.in", "Desktop/Cd-Rom". ($2 && "_$2") .".kdelnk",
 			      1, %toreplace);
-	} elsif (/^\/dev\/(\S+)\s+\/mnt\/zip (\d*)\s+/x) {
+	} elsif (m|^/dev/(\S+)\s+/mnt/zip(\d*)\s+|) {
 	    my %toreplace = ( device => $1, id => $2 );
 	    template2userfile($prefix, "/usr/share/zip.fsdev.kdelnk.in", "Desktop/Zip". ($2 && "_$2") .".kdelnk",
 			      1, %toreplace);
-	} elsif (/^\/dev\/(\S+)\s+\/mnt\/floppy (\d*)\s+/x) {
+	} elsif (m|^/dev/(\S+)\s+/mnt/floppy(\d*)\s+|) {
 	    my %toreplace = ( device => $1, id => $2 );
 	    template2userfile($prefix, "/usr/share/floppy.fsdev.kdelnk.in", "Desktop/Floppy". ($2 && "_$2") .".kdelnk",
 			      1, %toreplace);
-	} elsif (/^\/mnt\/cdrom (\d*)\s+\/mnt\/cdrom\d*\s+supermount/x) {
+	} elsif (m|^/mnt/cdrom(\d*)\s+/mnt/cdrom\d*\s+supermount|) {
 	    my %toreplace = ( id => $1 );
-	    template2userfile($prefix, "/usr/share/cdrom.kdelnk.in", "Desktop/Cd-Rom". ($2 && "_$2") .".kdelnk",
+	    template2userfile($prefix, "/usr/share/cdrom.kdelnk.in", "Desktop/Cd-Rom". ($1 && "_$1") .".kdelnk",
 			      1, %toreplace);
-	} elsif (/^\/mnt\/zip (\d*)\s+\/mnt\/zip\d*\s+supermount/x) {
+	} elsif (m|^/mnt/zip(\d*)\s+/mnt/zip\d*\s+supermount|) {
 	    my %toreplace = ( id => $1 );
-	    template2userfile($prefix, "/usr/share/zip.kdelnk.in", "Desktop/Zip". ($2 && "_$2") .".kdelnk",
+	    template2userfile($prefix, "/usr/share/zip.kdelnk.in", "Desktop/Zip". ($1 && "_$1") .".kdelnk",
 			      1, %toreplace);
-	} elsif (/^\/mnt\/floppy (\d*)\s+\/mnt\/floppy\d*\s+supermount/x) {
+	} elsif (m|^/mnt/floppy(\d*)\s+/mnt/floppy\d*\s+supermount|) {
 	    my %toreplace = ( id => $1 );
-	    template2userfile($prefix, "/usr/share/floppy.kdelnk.in", "Desktop/Floppy". ($2 && "_$2") .".kdelnk",
+	    template2userfile($prefix, "/usr/share/floppy.kdelnk.in", "Desktop/Floppy". ($1 && "_$1") .".kdelnk",
 			      1, %toreplace);
-	} elsif (/^\/dev\/(\S+)\s+\/mnt\/DOS_ (\S*)\s+/x) {
-	    my %toreplace = ( device => $1, id => $2, mntpoint => "/mnt/DOS_$2" );
+	} elsif (m|^/dev/(\S+)\s+(/mnt/DOS_\S*)\s+|) {
+	    my %toreplace = ( device => $1, id => $2, mntpoint => $2 );
 	    template2userfile($prefix, "/usr/share/Dos_.kdelnk.in", "Desktop/Dos_$2.kdelnk", 1, %toreplace);
-	} elsif (/^\/dev\/(\S+)\s+(\S*)\s+vfat\s+/x) {
+	} elsif (m|^/dev/(\S+)\s+(\S*)\s+vfat\s+|) {
 	    my %toreplace = ( device => $1, id => $1, mntpoint => $2 );
 	    template2userfile($prefix, "/usr/share/Dos_.kdelnk.in", "Desktop/Dos_$1.kdelnk", 1, %toreplace);
 	}
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 7fdb9bf93..26008ff7d 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -266,7 +266,7 @@ sub afterInstallPackages($) {
     install_any::kdeicons_postinstall($o->{prefix});
 
     substInFile { s/^(GreetString)=.*/$1=Welcome to [HOSTNAME]/ } "$o->{prefix}/usr/share/config/kdmrc";
-    substInFile { s/^(UserView)=false/$1=true/ } "$o->{prefix}/usr/share/config/kdmrc" if $o->{security} < 3;    
+    substInFile { s/^(UserView)=false/$1=true/ } "$o->{prefix}/usr/share/config/kdmrc" if $o->{security} < 3;
     run_program::rooted($o->{prefix}, "kdeDesktopCleanup");
 
     #- move some file after an upgrade that may be seriously annoying.
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 3b6f213bf..6c65f2d97 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -22,54 +22,54 @@ my $KMAP_MAGIC = 0x8B39C07F;
 #- a best guess of the keyboard layout, based on the choosen locale
 my %lang2keyboard =
 (
-  "af" => "us_intl",
-  "bg" => "bg",
-  "br" => "fr",
-  "ca" => "es",
-  "cs" => "cz",
-  "cy" => "uk",
-  "da" => "dk",
-"de_AT"=> "de",
-"de_DE"=> "de", 
-  "el" => "gr",
-  "en" => "us",
-"en_GB"=> "uk",
-  "eo" => "us_intl",
-"es_AR"=> "la",
-"es_ES"=> "es",
-"es_MX"=> "la",
-  "es@tradicional" => "es",
-  "es" => "es",
-  "et" => "ee",
-  "eu" => "es",
-  "fi" => "fi",
-"fr_FR"=> "fr",
-  "ga" => "uk",
-  "gl" => "es",
-  "he" => "il",
-  "hr" => "yu",
-  "hu" => "hu",
-  "hy" => "am",
-  "is" => "is",
-  "it" => "it",
-  "ka" => "ge_la",
-  "lt" => "lt",
-  "nl" => "nl",
-  "no" => "no",
-  "no@nynorsk" => "no",
-  "oc" => "fr",
-  "pl" => "pl",
-"pt_BR"=> "br",
-"pt_PT"=> "pt",
-  "ru" => "ru",
-  "sk" => "sk",
-  "sl" => "si",
-  "sr" => "yu",
-  "sv" => "se",
-  "th" => "th",
-  "tr" => "tr_q",
-  "uk" => "ua",
-  "wa" => "be",
+  'af' => 'us_intl',
+  'bg' => 'bg',
+  'br' => 'fr',
+  'ca' => 'es',
+  'cs' => 'cz',
+  'cy' => 'uk',
+  'da' => 'dk',
+'de_AT'=> 'de',
+'de_DE'=> 'de', 
+  'el' => 'gr',
+  'en' => 'us',
+'en_GB'=> 'uk',
+  'eo' => 'us_intl',
+'es_AR'=> 'la',
+'es_ES'=> 'es',
+'es_MX'=> 'la',
+  'es@tradicional' => 'es',
+  'es' => 'es',
+  'et' => 'ee',
+  'eu' => 'es',
+  'fi' => 'fi',
+'fr_FR'=> 'fr',
+  'ga' => 'uk',
+  'gl' => 'es',
+  'he' => 'il',
+  'hr' => 'yu',
+  'hu' => 'hu',
+  'hy' => 'am',
+  'is' => 'is',
+  'it' => 'it',
+  'ka' => 'ge_la',
+  'lt' => 'lt',
+  'nl' => 'nl',
+  'no' => 'no',
+  'no@nynorsk' => 'no',
+  'oc' => 'fr',
+  'pl' => 'pl',
+'pt_BR'=> 'br',
+'pt_PT'=> 'pt',
+  'ru' => 'ru',
+  'sk' => 'sk',
+  'sl' => 'si',
+  'sr' => 'yu',
+  'sv' => 'se',
+  'th' => 'th',
+  'tr' => 'tr_q',
+  'uk' => 'ua',
+  'wa' => 'be',
 );
 
 #- key = extension for Xmodmap file, [0] = description of the keyboard,
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 1bcfa8fb0..e0a058fca 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -32,9 +32,9 @@ bc                                            40     0    25
 BeroList                                       0    99    15
 BeroList-CGI                                   0    99    15
 bin86                                         15     0    91
-bind                                          12    99    10
-bind-devel                                    10     0     0
-bind-utils                                    16    99    14
+bind                                           0    80     0
+bind-devel                                     0     0     0
+bind-utils                                    65    80    65
 binutils                                      47     0    87
 bison                                         10     0    80
 BitchX                                        43     0    15
@@ -42,7 +42,7 @@ blt                                           10     0    75
 bootparamd                                    20    82     0
 byacc                                         16     0    80
 bzip2                                         41    79    75
-caching-nameserver                             0    40    13
+caching-nameserver                             0    80     0
 cbb                                           55     0    13
 cdecl                                         10     0    70
 cdp                                           40     0    27
@@ -125,7 +125,7 @@ freeciv                                       54     0    53
 freetype                                      10     0     4
 freetype-devel                                10     0     0
 fribidi                                       10     0     0
-ftp                                           90     0    49
+ftp                                           90    90    90
 fvwm                                          50     0    36
 fvwm2                                         23     0    36
 fvwm2-icons                                   23     0    36
@@ -249,8 +249,8 @@ imwheel                                       80     0    58
 indent                                        20     0    91
 indexhtml                                      0    99    96
 inews                                          6    12    15
-inn                                            0    99    20
-inn-devel                                     10    15    20
+inn                                            0    80    20
+inn-devel                                      0    15    20
 install-guide                                 40     0    36
 intimed                                        0    45    10
 ipchains                                      15    99    13
diff --git a/perl-install/share/compssUsers b/perl-install/share/compssUsers
index d099165bb..dc78cf2f7 100644
--- a/perl-install/share/compssUsers
+++ b/perl-install/share/compssUsers
@@ -10,6 +10,12 @@ KDE
 Gnome
 	gnome
 	enlightenment
+	gmc
+	XFree86
+	XFree86-75dpi-fonts
+
+Other window managers
+	window-managers:window-managers
 	XFree86
 	XFree86-75dpi-fonts	
 
@@ -34,11 +40,6 @@ Multimedia Support
 	multimedia
 	daemons:sound
 
-Other window managers
-	window-managers:window-managers
-	XFree86
-	XFree86-75dpi-fonts	
-
 Games
 	games