diff options
| -rw-r--r-- | docs/TODO | 9 | ||||
| -rw-r--r-- | perl-install/crypto.pm | 2 | ||||
| -rw-r--r-- | perl-install/fs.pm | 2 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 3 | ||||
| -rw-r--r-- | perl-install/share/compssList | 7 | ||||
| -rw-r--r-- | perl-install/share/compssUsers | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/printerdrake | 4 |
8 files changed, 20 insertions, 11 deletions
@@ -11,10 +11,11 @@ (done,pix)hd install: no umount is done at the end of install :( just before release: -- mandrake_doc-xx, the symlink is no good in /usr/doc/mandrake as -- crypto dependencies to update -- update kudzu's pcitable -- update pcitable for 86C368 if 3.3.6 (and other S3 3D's) +(done,pix)- mandrake_doc-xx, the symlink is no good in /usr/doc/mandrake as +(done,pix)- crypto dependencies to update +(done,pix)- update kudzu's pcitable +(done,pix)- update pcitable for 86C368 if 3.3.6 (and other S3 3D's) + ("ATI|3D Rage P/M Mobility AGP 2x" -> changed to Server:Mach64) -------------------------------------------------------------------------------- remount ro before X test. diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm index dd86e24c6..884286c9a 100644 --- a/perl-install/crypto.pm +++ b/perl-install/crypto.pm @@ -8,10 +8,12 @@ use log; use ftp; my %mirrors = ( + "ftp.ucr.ac.cr" => [ "Costa Rica", "/pub/Unix/linux/mandrake/Mandrake" ], "ftp.nectec.or.th" => [ "Thailand", "/pub/mirrors/Mandrake-crypto" ], "ftp.tvd.be" => [ "Belgium", "/packages/mandrake-crypto" ], "sunsite.mff.cuni.cz" => [ "Czech Republic", "/OS/Linux/Dist/Mandrake-crypto" ], "ftp.uni-kl.de" => [ "Germany", "/pub/linux/mandrake/Mandrake-crypto" ], + "ftp.duth.gr" => [ "Grece", "/pub/mandrake-crypto" ], "ftp.leo.org" => [ "Germany", "/pub/comp/os/unix/linux/Mandrake/Mandrake-crypto" ], "sunsite.uio.no" => [ "Norway", "/pub/unix/Linux/Mandrake-crypto" ], "ftp.sunet.se" => [ "Sweden", "/pub/Linux/distributions/mandrake-crypto" ], diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 055347234..f2f3a48de 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -274,6 +274,8 @@ sub write_fstab($;$$) { @new{($mntpoint, "/dev/$device")} = undef; mkdir "$prefix/$mntpoint", 0755 or log::l("failed to mkdir $prefix/$mntpoint: $!"); + eval { devices::make("$prefix/dev/$device") }; + [ "/dev/$device", $mntpoint, "vfat", "user,exec,conv=auto", 0, 0 ]; } grep { isFat($_) && ! exists $new{"/dev/$_->{device}"} } @$fstab; diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 18e5a5bcd..e111c9043 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -60,7 +60,7 @@ my (%installSteps, @orderedInstallSteps); addUser => [ __("Add a user"), 1, 1, '', "doInstallStep" ], createBootdisk => [ __("Create a bootdisk"), 1, 0, '', "doInstallStep" ], setupBootloader => [ __("Install bootloader"), 1, 1, '', "doInstallStep" ], - configureX => [ __("Configure X"), 1, 0, ''],#, ["formatPartitions", "setupBootloader"] ], + configureX => [ __("Configure X"), 1, 0, '', ["formatPartitions", "setupBootloader"] ], exitInstall => [ __("Exit install"), 0, 0, 'beginner' ], ); for (my $i = 0; $i < @installSteps; $i += 2) { diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 91d81921c..4285ec229 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -313,7 +313,8 @@ sub setSelectedFromCompssList { map_index { $ind = $::i if $_ eq $install_class } @$compssListLevels; defined $ind or log::l("unknown install class $install_class in compssList"), return; - my @values = map { $_->{values}[$ind] + ($_->{unskip} ? 10 : 0) } @packages; + #- special case for /^k/ aka kde stuff + my @values = map { $_->{values}[$ind] + ($_->{unskip} && $_->{name} !~ /^k/ ? 10 : 0) } @packages; sort { $values[$b] <=> $values[$a] } 0 .. $#packages; }; foreach (@places) { diff --git a/perl-install/share/compssList b/perl-install/share/compssList index ea71aaa58..4a106ed16 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -46,9 +46,9 @@ XFree86-8514 -30 -30 -30 XFree86-AGX -30 -30 -30 XFree86-FBDev -30 -30 -30 XFree86-I128 -30 -30 -30 -XFree86-ISO8859-9-100dpi-fontsv 54 0 49 -XFree86-ISO8859-9 54 0 49 -XFree86-ISO8859-9-75dpi-fonts 75 0 70 +XFree86-ISO8859-9-100dpi-fonts -10 -20 -10 +XFree86-ISO8859-9 -10 -20 -10 +XFree86-ISO8859-9-75dpi-fonts -10 -20 -10 XFree86-Mach32 -30 -30 -30 XFree86-Mach64 -30 -30 -30 XFree86-Mach8 -30 -30 -30 @@ -884,6 +884,7 @@ transfig 16 0 14 tree 40 25 10 trn 46 0 41 trojka 54 0 48 +ttfonts 87 0 80 tunelp 24 15 28 ucd-snmp 0 70 45 ucd-snmp-devel 0 25 45 diff --git a/perl-install/share/compssUsers b/perl-install/share/compssUsers index 827e3c0eb..d749c4ef7 100644 --- a/perl-install/share/compssUsers +++ b/perl-install/share/compssUsers @@ -1,5 +1,4 @@ Graphics Manipulation - kde:multimedia:graphics multimedia:graphic KDE @@ -45,7 +44,6 @@ Games System configuration configuration:system - kde:administration:utilities Web Server +apache diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake index 76caa66c1..2e7ed085d 100755 --- a/perl-install/standalone/printerdrake +++ b/perl-install/standalone/printerdrake @@ -36,6 +36,10 @@ $::skiptest = /-skiptest/; $::testing = /-testing/; $::isStandalone = 1; +my $f = "/usr/lib/rhs/rhs-printfilters"; +-e $f or system("urpmi --auto rhs-printfilters"); +-e $f or die "install rhs-printfilters first!\n"; + my $in = vnew interactive('su'); printerdrake::main('', printerdrake::getinfo(''), $in, sub { `urpmi --auto $_[0]` }); |