summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-06-05 19:10:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-06-05 19:10:21 +0000
commitf4f2d5e5a0ad224db2e5983054657b3cefdc9d06 (patch)
tree3b12d5f8e1b6156a44ab859e9f49f83e3faec223
parentdb2b62bdd8670a29de6ad645f28a48d758b3cb84 (diff)
downloaddrakx-f4f2d5e5a0ad224db2e5983054657b3cefdc9d06.tar
drakx-f4f2d5e5a0ad224db2e5983054657b3cefdc9d06.tar.gz
drakx-f4f2d5e5a0ad224db2e5983054657b3cefdc9d06.tar.bz2
drakx-f4f2d5e5a0ad224db2e5983054657b3cefdc9d06.tar.xz
drakx-f4f2d5e5a0ad224db2e5983054657b3cefdc9d06.zip
no_comment
-rw-r--r--perl-install/ChangeLog5
-rw-r--r--perl-install/Makefile.drakxtools2
-rw-r--r--perl-install/Xconfigurator.pm3
-rw-r--r--perl-install/Xconfigurator_consts.pm2
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/partition_table.pm9
-rw-r--r--perl-install/share/list4
-rw-r--r--rescue/list.i3862
8 files changed, 21 insertions, 8 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 4129032ab..5ea947211 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -3,6 +3,11 @@
* install_steps.pm,lang.pm: added load_console_font, to load the
proper console fonts (text mode install is not very useful otherwise)
+2000-06-03 Pixel <pixel@mandrakesoft.com>
+
+ * diskdrake.pm (Create): don't accept less than 32MB part for reiserfs
+ * diskdrake.pm (Type): don't accept less than 32MB part for reiserfs
+
2000-06-01 Pablo Saratxaga <pablo@mandrakesoft.com>
* share/fonts.tar.bz2: replaced the Korean 16pt fonts by a 12pt font;
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 3f191cde4..ccbcd23f7 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -21,6 +21,7 @@ $(DIRS):
install:
install -d $(BINDEST) $(ETCDEST) $(SBINDEST) $(LIBDEST) $(BINX11DEST) $(LIBX11DEST) $(LIBDEST)/po $(DIRS:%=$(LIBDEST)/%)
+ install -d $(LIBDEST)/sbus_probing
install $(STANDALONEPMS) $(SBINDEST)
mv -f $(SBINDEST)/lspcidrake $(BINDEST)
install -s ddcprobe/ddcxinfos serial_probe/serial_probe $(SBINDEST)
@@ -33,6 +34,7 @@ install:
install -m 644 $(patsubst %,Newt/%.pm,Newt) $(LIBDEST)/Newt
install -m 644 $(patsubst %,c/%.pm,stuff) $(LIBDEST)/c
install -m 644 $(patsubst %,pci_probing/%.pm,main pcitable pci_class) $(LIBDEST)/pci_probing
+ install -m 644 $(patsubst %,sbus_probing/%.pm,main) $(LIBDEST)/sbus_probing
install -m 644 $(patsubst %,resize_fat/%.pm,main any boot_sector c_rewritten dir_entry directory fat info_sector io) $(LIBDEST)/resize_fat
cp -rf auto icons $(LIBDEST)
bzip2 -9 $(LIBDEST)/po/*.po
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 0a312f8eb..2cc67e0ce 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -9,6 +9,7 @@ use common qw(:common :file :functional :system);
use log;
use run_program;
use Xconfigurator_consts;
+use sbus_probing::main;
use my_gtk qw(:wrappers);
my $tmpconfig = "/tmp/Xconfig";
@@ -414,7 +415,7 @@ You can switch if off if you want, you'll hear a beep when it's over"), 1) or re
#- restore the virtual console
setVirtual($vt);
- print "\a"; #- beeeep!
+ local $| = 1; print "\a"; #- beeeep!
}
sub autoDefaultDepth($$) {
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index 6a3eb49ff..9e86d36d1 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -155,7 +155,7 @@ $default_monitor = "High Frequency SVGA, 1024x768 at 70 Hz";
%lines = (
#- 'Cirrus Logic|GD 5446' => [ ' Option "no_bitblt"' ],
- 'Silicon Integrated Systems [SiS]|86C326' => [ ' Option "noaccel"' ],
+ 'Silicon Integrated Systems [SiS]|86C326' => [ qq( Option "noaccel"\n Option "sw_cursor") ],
#- 'Trident Microsystems|Cyber 9525' => [ ' Option "noaccel"' ],
#- 'S3 Inc.|86c368 [Trio 3D/2X]' => [ ' ChipID 0x8a10' ],
);
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index c44728d1f..a5fccc1c5 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -507,7 +507,7 @@ sub configureX {
fs::write($o->{prefix}, $o->{fstab}, $o->{manualFstab}, $o->{useSupermount});
modules::write_conf("$o->{prefix}/etc/conf.modules");
- $o->setupXfree;# if pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'XFree86')) || $clicked;
+ $o->setupXfree if pkgs::packageFlagInstalled(pkgs::packageByName($o->{packages}, 'XFree86')) || $clicked;
}
#------------------------------------------------------------------------------
sub generateAutoInstFloppy {
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 4b77d5d6a..82eb6a4c5 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -22,7 +22,7 @@ use log;
@important_types = ('Linux native', 'Linux swap', 'Win98 FAT32');
-@important_types2 = ('ReiserFS', 'Linux RAID');
+@important_types2 = (arch() =~ /i.86/ ? 'ReiserFS' : (), 'Linux RAID');
@fields2save = qw(primary extended totalsectors);
@@ -32,9 +32,9 @@ my %types = (
arch() =~ /^ppc/ ? (
0x401 => 'Apple Partition',
0x402 => 'Apple HFS Partition',
-) : (
+) : arch() =~ /^i.86/ ? (
0x183 => 'ReiserFS',
-), arch() =~ /^sparc/ ? (
+) : arch() =~ /^sparc/ ? (
0x1 => 'SunOS boot',
0x2 => 'SunOS root',
0x3 => 'SunOS swap',
@@ -345,7 +345,8 @@ sub get_normal_parts($) {
sub get_holes($) {
my ($hd) = @_;
- my $start = 1;
+ my $start = arch() eq "alpha" ? 2048 : 1;
+
map {
my $current = $start;
$start = $_->{start} + $_->{size};
diff --git a/perl-install/share/list b/perl-install/share/list
index 3577ffa82..aba226dc8 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -61,6 +61,8 @@
/usr/lib/perl5/5.6.0/SelfLoader.pm
/usr/lib/perl5/5.6.0/Symbol.pm
/usr/lib/perl5/5.6.0/Time/Local.pm
+/usr/lib/perl5/5.6.0/IO/Socket/INET.pm
+/usr/lib/perl5/5.6.0/IO/Socket/UNIX.pm
/usr/lib/perl5/5.6.0/dumpvar.pl
/usr/lib/perl5/5.6.0/warnings.pm
/usr/lib/perl5/5.6.0/warnings/register.pm
@@ -70,6 +72,7 @@
/usr/lib/perl5/5.6.0/ARCH-linux/Config.pm
/usr/lib/perl5/5.6.0/ARCH-linux/Data/Dumper.pm
/usr/lib/perl5/5.6.0/ARCH-linux/DynaLoader.pm
+/usr/lib/perl5/5.6.0/ARCH-linux/Errno.pm
/usr/lib/perl5/5.6.0/ARCH-linux/Fcntl.pm
/usr/lib/perl5/5.6.0/ARCH-linux/XSLoader.pm
/usr/lib/perl5/5.6.0/ARCH-linux/auto/Fcntl/Fcntl.bs
@@ -78,6 +81,7 @@
/usr/lib/perl5/5.6.0/ARCH-linux/IO/File.pm
/usr/lib/perl5/5.6.0/ARCH-linux/IO/Handle.pm
/usr/lib/perl5/5.6.0/ARCH-linux/IO/Seekable.pm
+/usr/lib/perl5/5.6.0/ARCH-linux/IO/Select.pm
/usr/lib/perl5/5.6.0/ARCH-linux/IO/Socket.pm
/usr/lib/perl5/5.6.0/ARCH-linux/Socket.pm
/usr/lib/perl5/5.6.0/ARCH-linux/_h2ph_pre.ph
diff --git a/rescue/list.i386 b/rescue/list.i386
index 1bbe9fe7f..ed63a53cc 100644
--- a/rescue/list.i386
+++ b/rescue/list.i386
@@ -3,5 +3,5 @@
/sbin/mkreiserfs
/sbin/lspci
/usr/share/pci.ids
-/usr/bin/perl5.00503
+/usr/bin/perl5.6.0
/sbin/lilo