summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-27 20:52:11 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-27 20:52:11 +0000
commitf902492a01c974283c9c800ddbd5de651c474c25 (patch)
tree4a8eb59f4644fb18ef8e3a448c79061643b60145 /perl-install
parent73e7a0f1107be369f7304335082afac4f96ee3d2 (diff)
downloaddrakx-f902492a01c974283c9c800ddbd5de651c474c25.tar
drakx-f902492a01c974283c9c800ddbd5de651c474c25.tar.gz
drakx-f902492a01c974283c9c800ddbd5de651c474c25.tar.bz2
drakx-f902492a01c974283c9c800ddbd5de651c474c25.tar.xz
drakx-f902492a01c974283c9c800ddbd5de651c474c25.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Makefile8
-rw-r--r--perl-install/Xconfig.pm2
-rw-r--r--perl-install/Xconfigurator.pm27
-rw-r--r--perl-install/commands.pm17
-rw-r--r--perl-install/common.pm1
-rw-r--r--perl-install/fsedit.pm5
-rw-r--r--perl-install/install2.pm26
-rw-r--r--perl-install/install_steps_interactive.pm13
-rw-r--r--perl-install/lang.pm6
-rw-r--r--perl-install/modules.pm27
-rw-r--r--perl-install/mouse.pm2
-rw-r--r--perl-install/my_gtk.pm7
-rw-r--r--perl-install/pkgs.pm17
-rw-r--r--perl-install/run_program.pm12
-rw-r--r--perl-install/share/install.rc4
-rw-r--r--perl-install/share/list21
16 files changed, 106 insertions, 89 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 7a4904b6d..986cf9fec 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -139,8 +139,8 @@ get_needed_files: $(SO_FILES)
ln -sf ash $(DEST)/usr/bin/sh
-# tar xfy locales.tar.bz2 -C $(DEST)
- DEST=$(DEST) perl -I. -MForMakefile -e 'locale()'
+ tar xfy locales.tar.bz2 -C $(DEST)
+# DEST=$(DEST) perl -I. -MForMakefile -e 'locale()'
DEST=$(DEST) perl -I. -MForMakefile -e 'xmodmap()'
cp -a keymaps $(DEST)/usr/share
@@ -150,6 +150,8 @@ get_needed_files: $(SO_FILES)
cp compss compssList $(ROOTDEST)/Mandrake/base
cp -f ../modules/modules.cpio.bz2 $(DEST)/lib/
+ install -d $(DEST)/lib/modules
+ cp -f ../modules/pristine/* $(DEST)/lib/modules
ln -s install2 $(DEST)/usr/bin/runinstall2
# echo -e "#!/bin/sh\n\nexec '/usr/bin/sh'" > $(DEST)/usr/bin/runinstall2
@@ -178,7 +180,7 @@ stage2:
$(SUDO) umount /mnt/stage2 ; true
dd if=/dev/zero of=$(STAGE2) bs=1M count=14
echo y | /sbin/mke2fs $(STAGE2)
- $(SUDO) mount $(STAGE2) /mnt/stage2 -o loop
+ $(SUDO) mount -t ext2 $(STAGE2) /mnt/stage2 -o loop
# hack to reduce the STAGE2 image
rm $(STAGE2TMP)/usr/X11R6/bin/XF86_VGA16
diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm
index befb0f7dd..f09a3e0e6 100644
--- a/perl-install/Xconfig.pm
+++ b/perl-install/Xconfig.pm
@@ -18,7 +18,7 @@ sub keymap_translate {
sub getinfo {
- my $o = { monitor => { hsyncrange => "30-54" } };
+ my $o = {};
# getinfoFromXF86Config($o);
getinfoFromDDC($o);
getinfoFromSysconfig($o);
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 049a10d4e..ffb966628 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -263,13 +263,32 @@ sub testFinalConfig($;$) {
unlink "$prefix/tmp/.X9-lock";
- my $pid; unless ($pid = fork) {
+ my $f_err = "$prefix/tmp/Xoutput";
+ my $pid;
+ unless ($pid = fork) {
+ open STDERR, ">$f_err";
my @l = "X";
@l = ($o->{card}{prog}, "-xf86config", $tmpconfig) if $::testing;
chroot $prefix if $prefix;
- exec @l, ":9" or exit 1;
+ exec @l, ":9" or exit 'true';
+ }
+ do { sleep 1 } until c::Xtest(":9") || waitpid($pid, c::WNOHANG());
+
+ my $b = before_leaving { unlink $f_err };
+
+ local *F; open F, $f_err;
+ while (<F>) {
+ if (/^Fatal server error/) {
+ my @msg; while (<F>) {
+ /^$/ and last;
+ push @msg, $_;
+ }
+ $in->ask_warn('', [ _("An error occurred:"), " ",
+ @msg,
+ _("\ntry changing some parameters") ]);
+ return 0;
+ }
}
- do { sleep 1; } until (c::Xtest(':0'));
#- create a link from the non-prefixed /tmp/.X11-unix/X9 to the prefixed one
#- that way, you can talk to :9 without doing a chroot
@@ -285,7 +304,7 @@ sub testFinalConfig($;$) {
$ENV{DISPLAY} = ":9";
gtkset_mousecursor(68);
- gtkset_background(200, 210, 210);
+ gtkset_background(200 * 256, 210 * 256, 210 * 256);
my ($h, $w) = Gtk::Gdk::Window->new_foreign(Gtk::Gdk->ROOT_WINDOW)->get_size;
$my_gtk::force_position = [ $w / 3, $h / 2.4 ];
$my_gtk::force_focus = 1;
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index e4510a22d..3ff726617 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -395,12 +395,19 @@ sub unpack_ {
sub insmod {
my ($h) = getopts(\@_, qw(h));
$h || @_ == 0 and die "usage: insmod <module> [options]\n";
- my $name = shift;
- my $f = "/tmp/$name.o";
+ my $f = local $_ = shift;
+
require 'run_program.pm';
- run_program::run("cd /tmp ; bzip2 -cd /lib/modules.cpio.bz2 | cpio -i $name.o");
- -r $f or die "can't find module $name";
- run_program::run(["insmod_", "insmod"], $f, @_) or die("insmod $name failed");
+
+ unless (m|/|) {
+ m/(.*)\.o/ and die "either give ./$_ or $1\n";
+ unless (-r ($f = "/lib/modules/$_.o")) {
+ $f = "/tmp/$_.o";
+ run_program::run("cd /tmp ; bzip2 -cd /lib/modules.cpio.bz2 | cpio -i $_.o");
+ }
+ }
+ -r $f or die "can't find module $_";
+ run_program::run(["insmod_", "insmod"], $f, @_) or die("insmod $_ failed");
unlink $f;
}
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 5094e0e48..35bed9e67 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -184,7 +184,6 @@ sub catch_cdie(&&) {
}
sub cdie($;&) {
- print "JJJJ\n";
my ($err, $f) = @_;
foreach (@common::cdie_catches) {
$@ = $err;
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index b7243c883..c4e43e148 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -197,6 +197,11 @@ sub allocatePartitions($$) {
for (my $i = 0; $i < @$v; $i += 2) {
my $size = $v->[$i + 1] - $v->[$i];
$e{size} > $size and next;
+
+ if ($v->[$i] + $e{size} > 1024 * partition_table::cylinder_size($hd)) {
+ next if $e{mntpoint} eq "/boot" ||
+ $e{mntpoint} eq "/" && !has_mntpoint("/boot", $hds);
+ }
$e{start} = $v->[$i];
$e{rootDevice} = $hd->{device};
partition_table::adjustStartAndEnd($hd, \%e);
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index e8fee47f8..cd53e4b6c 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -175,7 +175,7 @@ $o = $::o = {
steps => \%installSteps,
orderedSteps => \@orderedInstallSteps,
- base => [ qw(basesystem initscripts console-tools mkbootdisk anacron rhs-hwdiag utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time timeconfig tmpwatch util-linux vim-minimal vixie-cron which cpio) ],
+ base => [ qw(basesystem initscripts console-tools mkbootdisk anacron rhs-hwdiag utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time timeconfig tmpwatch util-linux vim-minimal vixie-cron which cpio perl) ],
#- for the list of fields available for user and superuser, see @etc_pass_fields in install_steps.pm
#- intf => [ { DEVICE => "eth0", IPADDR => '1.2.3.4', NETMASK => '255.255.255.128' } ],
@@ -235,7 +235,7 @@ sub selectInstallClass {
$::expert = $o->{installClass} eq "expert";
$::beginner = $o->{installClass} eq "beginner";
$o->{partitions} ||= $suggestedPartitions{$o->{installClass}};
- $o->{partitioning}{auto_allocate} = 1;
+ $o->{partitioning}{auto_allocate} ||= -1 if $::beginner;
$o->setPackages(\@install_classes) if $o->{steps}{choosePackages}{entered} >= 1;
}
@@ -269,7 +269,11 @@ I'll try to go on blanking bad partitions"));
die _("An error has occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem");
}
- eval { fsedit::auto_allocate($o->{hds}, $o->{partitions}) } if $o->{partitioning}{auto_allocate};
+ $o->{partitioning}{auto_allocate} = 0
+ if $o->{partitioning}{auto_allocate} == -1 && fsedit::get_fstab(@{$o->{hds}}) >= 4;
+
+ eval { fsedit::auto_allocate($o->{hds}, $o->{partitions}) } if
+ $o->{partitioning}{auto_allocate} && ($o->{partitioning}{auto_allocate} != -1 || $::beginner);
if ($o->{partitioning}{auto_allocated} = ($::beginner && fsedit::get_root_($o->{hds}) && $_[1] == 1)) {
install_steps::doPartitionDisks($o, $o->{hds});
@@ -284,21 +288,19 @@ I'll try to go on blanking bad partitions"));
$o->{fstab} = [ fsedit::get_fstab(@{$o->{hds}}) ];
fsedit::get_root($o->{fstab}) or die _("partitioning failed: no root filesystem");
-
}
sub formatPartitions {
- if ($o->{partitioning}{auto_allocated}) { #- if all was auto_allocated, no need to ask, go on!
- install_steps::choosePartitionsToFormat($o, $o->{fstab});
- } else {
- $o->choosePartitionsToFormat($o->{fstab});
- }
+ $o->choosePartitionsToFormat($o->{fstab});
+
unless ($::testing) {
$o->formatPartitions(@{$o->{fstab}});
fs::mount_all([ grep { isExt2($_) || isSwap($_) } @{$o->{fstab}} ], $o->{prefix});
}
- mkdir "$o->{prefix}/$_", 0755 foreach qw(dev etc etc/sysconfig etc/sysconfig/network-scripts
- home mnt root tmp var var/tmp var/lib var/lib/rpm);
+ mkdir "$o->{prefix}/$_", 0755 foreach
+ qw(dev etc etc/sysconfig etc/sysconfig/console etc/sysconfig/network-scripts
+ etc/sysconfig/network-scripts
+ home mnt root tmp var var/tmp var/lib var/lib/rpm);
}
#------------------------------------------------------------------------------
@@ -477,7 +479,7 @@ sub main {
$o->kill_action;
/^setstep (.*)/ and $o->{step} = $1, $clicked = 1, redo MAIN;
/^theme_changed$/ and redo MAIN;
- eval { $o->errorInStep($_) };
+ eval { $o->errorInStep($_) } unless /^already displayed/;
$@ and next;
$o->{step} = $o->{steps}{$o->{step}}{onError};
redo MAIN;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index ceaa42380..6ccbb8451 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -121,6 +121,9 @@ sub choosePartitionsToFormat($$) {
$o->SUPER::choosePartitionsToFormat($fstab);
my @l = grep { $_->{mntpoint} && !($::beginner && isSwap($_)) } @$fstab;
+
+ return if $::beginner && 0 == grep { ! $_->{toFormat} } @l;
+
$o->ask_many_from_list_ref('', _("Choose the partitions you want to format"),
[ map { isSwap($_) ? type2name($_->{type}) . " ($_->{device})" : $_->{mntpoint} } @l ],
[ map { \$_->{toFormat} } @l ]) or die "cancel";
@@ -618,7 +621,7 @@ _("Default") => { val => \$default, type => 'bool' },
);
$o->ask_from_entries_ref('',
- _(""),
+ '',
[ grep_index { even($::i) } @l ],
[ grep_index { odd($::i) } @l ],
) or return;
@@ -628,7 +631,13 @@ _("Default") => { val => \$default, type => 'bool' },
delete $b->{entries}{$old_name};
$b->{entries}{$name} = $e;
}
- $o->SUPER::setupBootloader;
+ eval { $o->SUPER::setupBootloader };
+ if ($@) {
+ $o->ask_warn('',
+ [ _("Lilo failed. The following error occured:"),
+ grep { !/^Warning:/ } cat_("$o->{prefix}/tmp/.error") ]);
+ die "already displayed";
+ }
}
#------------------------------------------------------------------------------
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 8d7465729..514d19594 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -174,7 +174,7 @@ sub write {
sub load_po($) {
my ($lang) = @_;
- my ($s, $from, $to, $state);
+ my ($s, $from, $to, $state, $fuzzy);
$s .= "package po::I18N;\n";
$s .= "\%$lang = (";
@@ -183,7 +183,7 @@ sub load_po($) {
local *F; open F, $f or return;
foreach (<F>) {
/^msgstr/ and $state = 1;
- /^msgid/ and $state = 2;
+ /^msgid/ && !$fuzzy and $state = 2;
if (/^(#|$)/ && $state != 3) {
$state = 3;
@@ -192,6 +192,8 @@ sub load_po($) {
}
$to .= (/"(.*)"/)[0] if $state == 1;
$from .= (/"(.*)"/)[0] if $state == 2;
+
+ $fuzzy = /^#, fuzzy/;
}
$s .= ");";
no strict "vars";
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 682b8959f..010e7b48f 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -14,31 +14,6 @@ my %conf;
my $scsi = 0;
my %deps = ();
-
-#-my @modules_fields = qw(shouldAutoprobe options flags defaultOptions);
-#-my %modules = (
-#- "8390" => [ 1 ],
-#- "cdu31a" => [ 0, \@cdu31aOptions ],
-#- "cm206" => [ 0, \@cm206Options ],
-#- "de4x5" => [ 1, \@de4x5Options, 'AUTOPROBE', "io=0" ],
-#- "ds" => [ 1, undef, 0, '' ],
-#- "fdomain" => [ 1, \@fdomainOptions, 0, '' ],
-#- "i82365" => [ 1, undef, 0, '' ],
-#- "isofs" => [ 1, undef, 0, '' ],
-#- "loop" => [ 1, undef, 0, '' ],
-#- "lp" => [ 1, undef, 0, '' ],
-#- "parport" => [ 1, undef, 0, '' ],
-#- "parport_pc" => [ 1, \@parportPcOptions, 0, "irq=7" ],
-#- "mcd" => [ 0, \@mcdOptions, 0, '' ],
-#- "ne" => [ 0, \@neOptions, 'FAKEAUTOPROBE', "io=0x300" ],
-#- "nfs" => [ 1, undef, 0, '' ],
-#- "optcd" => [ 0, \@optcdOptions, 0, '' ],
-#- "pcmcia_core" => [ 1, undef, 0, '' ],
-#- "sbpcd" => [ 1, \@sbpcdOptions, 0, '' ],
-#- "smbfs" => [ 1, undef, 0, '' ],
-#- "tcic" => [ 1, undef, 0, '' ],
-#- "vfat" => [ 1, undef, 0, '' ],
-#-);
my @drivers_by_category = (
[ \&detect_devices::hasEthernet, 'net', 'ethernet', {
"3c509" => "3com 3c509",
@@ -195,7 +170,7 @@ sub load($;$@) {
}
$conf{'scsi_hostadapter' . ($scsi++ || '')}{alias} = $name
- if $type eq 'scsi';
+ if $type && $type eq 'scsi';
$conf{$name}{options} = join " ", @options if @options;
}
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 1292b592b..4e91da97c 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -7,6 +7,7 @@ use strict;
#- misc imports
#-######################################################################################
use common qw(:common :system :functional);
+use modules;
use log;
my @mouses_fields = qw(nbuttons device MOUSETYPE XMOUSETYPE FULLNAME);
@@ -75,6 +76,7 @@ sub write($;$) {
sub detect() {
my %l;
+ eval { modules::load("serial") };
@l{qw(FULLNAME nbuttons MOUSETYPE XMOUSETYPE device)} = split("\n", `mouseconfig --nointeractive 2>/dev/null`) or die "mouseconfig failed";
\%l;
}
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index c43c8f899..a102ab1f6 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -18,6 +18,7 @@ use c;
use common qw(:common :functional);
my $forgetTime = 1000; #- in milli-seconds
+my @grabbed;
$border = 5;
1;
@@ -49,11 +50,13 @@ sub show($) {
my ($o) = @_;
$o->{window}->show;
$o->{rwindow}->show;
- $o->{rwindow}->grab_add if $my_gtk::grab || $o->{grab};
+ top(@grabbed)->grab_remove if @grabbed;
+ push(@grabbed, $o->{rwindow}), $o->{rwindow}->grab_add if $my_gtk::grab || $o->{grab};
}
sub destroy($) {
my ($o) = @_;
- $o->{rwindow}->grab_remove if $my_gtk::grab || $o->{grab};
+ (pop @grabbed)->grab_remove if @grabbed;
+ top(@grabbed)->grab_add if @grabbed;
$o->{rwindow}->destroy;
flush();
}
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index cc3dd166e..f9c5a462a 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -167,15 +167,13 @@ sub readCompss($) {
foreach (<$f>) {
/^\s*$/ || /^#/ and next;
s/#.*//;
- my ($options, $name) = /^(\S*)\s+(.*?)\s*$/ or log::l("bad line in compss: $_"), next;
- if ($name =~ /(.*):$/) {
+ if (/^(\S+)/) {
$ps = [];
- push @compss, { options => $options, name => $1, packages => $ps };
+ push @compss, { name => $1, packages => $ps };
} else {
- my $p = $packages->{$name} or log::l("unknown package $name (in compss)"), next;
- $p->{options} = $options;
- push @$ps, $p;
+ /(\S+)/ or log::l("bad line in compss: $_"), next;
+ push @$ps, $packages->{$1} || do { log::l("unknown package $1 (in compss)"); next };
}
}
\@compss;
@@ -302,7 +300,12 @@ sub install($$) {
$total += $p->{size};
}
- c::rpmdepOrder($trans) or c::rpmdbClose($db), c::rpmtransFree($trans), die "error ordering package list: ", c::rpmErrorString();
+ c::rpmdepOrder($trans) or
+ cdie "error ordering package list: " . c::rpmErrorString(),
+ sub {
+ c::rpmdbClose($db);
+ c::rpmtransFree($trans);
+ };
c::rpmtransSetScriptFd($trans, $fd);
eval { fs::mount("/proc", "$prefix/proc", "proc", 0) };
diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm
index 0f0d70eeb..7e91437e7 100644
--- a/perl-install/run_program.pm
+++ b/perl-install/run_program.pm
@@ -17,12 +17,18 @@ sub rooted {
fork and wait, return $? == 0;
{
- my ($stdout, $stdoutm);
- ($stdoutm, $stdout, @args) = @args if $args[0] eq ">" || $args[0] eq ">>";
+ my ($stdout, $stdoutm, $stderr, $stderrm);
+ ($stdoutm, $stdout, @args) = @args if $args[0] =~ /^>>?$/;
+ ($stderrm, $stderr, @args) = @args if $args[0] =~ /^2>>?$/;
open STDIN, "/dev/null" or die "can't open /dev/null as stdin";
- open STDERR, ">> /dev/tty7" or open STDERR, ">> /tmp/exec.log" or die "run_program can't log :(";
+ if ($stderr) {
+ $stderrm =~ s/2//;
+ open STDERR, "$stderrm $root$stderr" or die "run_program can't output in $root$stderr (mode `$stderrm')";
+ } else {
+ open STDERR, ">> /dev/tty7" or open STDERR, ">> /tmp/exec.log" or die "run_program can't log :(";
+ }
if ($stdout) {
open STDOUT, "$stdoutm $root$stdout" or die "run_program can't output in $root$stdout (mode `$stdoutm')";
} else {
diff --git a/perl-install/share/install.rc b/perl-install/share/install.rc
index b9a32a2e1..6c4a6c0d6 100644
--- a/perl-install/share/install.rc
+++ b/perl-install/share/install.rc
@@ -3,6 +3,7 @@ style "default-font"
fontset = "\
-*-arial-medium-r-normal-*-*-100-*-*-*-*-*-*,\
-*-helvetica-medium-r-normal-*-*-100-*-*-*-*-*-*,\
+-cronyx-helvetica-medium-r-normal-*-*-110-*-*-*-*-*-*,\
-*-tahoma-medium-r-normal-*-*-*-*-*-*-*-*-*,\
-*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0208.1990-0,\
-*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0208.1983-0,\
@@ -25,6 +26,7 @@ style "steps"
fontset = "\
-*-arial-medium-r-normal-*-*-80-*-*-*-*-*-*,\
-*-helvetica-medium-r-normal-*-*-80-*-*-*-*-*-*,\
+-cronyx-helvetica-medium-r-normal-*-*-110-*-*-*-*-*-*,\
-*-tahoma-medium-r-normal-*-*-*-*-*-*-*-*-*,\
-*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0208.1990-0,\
-*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0208.1983-0,\
@@ -35,8 +37,10 @@ style "steps"
-*-*-medium-r-normal-*-*-*-*-*-*-*-mulelao-1,\
-*-*-medium-r-normal-*-*-*-*-*-*-*-ibm-cp1133,\
-*-*-medium-r-normal-*-*-*-*-*-*-*-iso10646-1,\
+-*-*-medium-r-normal-*-*-*-*-*-*-*-iso10646-1,\
-taipei-*-medium-r-normal-*-*-*-*-*-*-*-big5-0"
+
}
style "logo"
diff --git a/perl-install/share/list b/perl-install/share/list
index 8cea39c36..d8e3d7d58 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -9,10 +9,6 @@
/sbin/mkdosfs
/sbin/mke2fs
/usr/bin/bzip2
-/usr/lib/gconv/gconv-modules
-/usr/lib/gconv/ISO8859-1.so
-/usr/lib/gconv/ISO8859-2.so
-/usr/lib/gconv/ISO8859-9.so
/usr/lib/perl5/5.00503/AutoLoader.pm
/usr/lib/perl5/5.00503/Carp.pm
/usr/lib/perl5/5.00503/Data/Dumper.pm
@@ -66,22 +62,5 @@
/usr/X11R6/bin/XF86_FBDev
/usr/X11R6/bin/XF86_VGA16
/usr/X11R6/bin/xmodmap
-/usr/X11R6/lib/X11/fonts/75dpi/fonts.dir
-/usr/X11R6/lib/X11/fonts/75dpi/fonts.alias
-/usr/X11R6/lib/X11/fonts/75dpi/helvR08.pcf.gz
-/usr/X11R6/lib/X11/fonts/75dpi/helvR10.pcf.gz
-/usr/X11R6/lib/X11/fonts/cyrillic/fonts.dir
-/usr/X11R6/lib/X11/fonts/cyrillic/fonts.alias
-/usr/X11R6/lib/X11/fonts/cyrillic/crox1h.pcf.gz
-/usr/X11R6/lib/X11/fonts/cyrillic/crox2h.pcf.gz
-/usr/X11R6/lib/X11/fonts/misc/fonts.dir
-/usr/X11R6/lib/X11/fonts/misc/fonts.alias
-/usr/X11R6/lib/X11/fonts/misc/6x13.pcf.gz
-/usr/X11R6/lib/X11/fonts/misc/cursor.pcf.gz
-/usr/X11R6/lib/X11/fonts/misc/7x14rk.pcf.gz
-/usr/share/fonts/ISO8859-9/75dpi/fonts.dir
-/usr/share/fonts/ISO8859-9/75dpi/fonts.alias
-/usr/share/fonts/ISO8859-9/75dpi/tr_helvR08.pcf.gz
-/usr/share/fonts/ISO8859-9/75dpi/tr_helvR10.pcf.gz
/usr/sbin/ext2resize
/usr/sbin/rescuept