summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/detect_devices.pm11
-rwxr-xr-xperl-install/install23
-rw-r--r--perl-install/install2.pm4
-rw-r--r--perl-install/pkgs.pm6
-rw-r--r--perl-install/share/list1
5 files changed, 15 insertions, 10 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 19bae0339..23c58ba7d 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -105,11 +105,12 @@ sub getCompaqSmartArray() {
my $f;
for (my $i = 0; -r ($f = "/proc/array/ida$i"); $i++) {
- local *F;
- open F, $f or die;
- local $_ = <F>;
- my ($name) = m|ida/(.*?):| or next;
- push @idi, { device => $name, info => "Compaq RAID logical disk", type => 'hd' };
+ foreach (cat_($f)) {
+ if (m|^(ida/.*?):|) {
+ push @idi, { device => $1, info => "Compaq RAID logical disk", type => 'hd' };
+ last;
+ }
+ }
}
@idi;
}
diff --git a/perl-install/install2 b/perl-install/install2
index 7d9c4a278..ff820edd0 100755
--- a/perl-install/install2
+++ b/perl-install/install2
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# DiskDrake
+# Mandrake Graphic Install
# Copyright (C) 1999 MandrakeSoft (pixel@linux-mandrake.com)
#
# This program is free software; you can redistribute it and/or modify
@@ -27,3 +27,4 @@ $::testing = $ENV{PERL_INSTALL_TEST};
install2::main(@ARGV);
+exec "true";
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 78262ff35..9f64b17ee 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -171,7 +171,7 @@ my @installSteps = (
formatPartitions => [ __("Format partitions"), 1, -1, "partitionDisks" ],
choosePackages => [ __("Choose packages to install"), 1, 1, "selectInstallClass" ],
doInstallStep => [ __("Install system"), 1, -1, ["formatPartitions", "selectPath"] ],
-# configureMouse => [ __("Configure mouse"), 1, 1, "formatPartitions" ],
+ configureMouse => [ __("Configure mouse"), 1, 1, "formatPartitions" ],
configureNetwork => [ __("Configure networking"), 1, 1, "formatPartitions" ],
configureTimezone => [ __("Configure timezone"), 1, 1, "doInstallStep" ],
# configureServices => [ __("Configure services"), 0, 0 ],
@@ -334,7 +334,7 @@ sub configureMouse { $o->mouseConfig }
sub configureNetwork { $o->configureNetwork($_[1] == 1 && !$_[0]) }
sub configureTimezone {
my $f = "$o->{prefix}/etc/sysconfig/clock";
- return if -e $f && $_[1] == 1 && !$_[0];
+ return if ((-s $f) || 0) > 0 && $_[1] == 1 && !$_[0];
$o->timeConfig($f);
}
sub configureServices { $o->servicesConfig }
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 3813cfcbc..d57ad837b 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -115,8 +115,10 @@ sub psUsingHdlist() {
my $name = c::headerGetEntry($header, 'name');
$packages{$name} = {
- name => $name, version => c::headerGetEntry($header, 'version'), release => c::headerGetEntry($header, 'release'),
- header => $header, selected => 0, deps => [],
+ name => $name, header => $header, selected => 0, deps => [],
+ version => c::headerGetEntry($header, 'version'),
+ release => c::headerGetEntry($header, 'release'),
+ size => c::headerGetEntry($header, 'size'),
};
}
log::l("psUsingHdlist read " . scalar keys(%packages) . " headers");
diff --git a/perl-install/share/list b/perl-install/share/list
index 14862552a..71655f9cc 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -8,6 +8,7 @@
/sbin/insmod
/sbin/mkdosfs
/sbin/mke2fs
+/usr/X11R6/bin/XF86_SVGA
/usr/X11R6/bin/XF86_VGA16
/usr/X11R6/bin/xmodmap
/usr/bin/bzip2