summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-02-27 22:41:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-02-27 22:41:42 +0000
commit1c0127d9f80cb91dc16a212f7380f3a45381c0df (patch)
tree4d90407e4531605bfd9e290bd259cb2214a95cd4
parent32add8d1612f809a0185db584e0e3e9dd4794c8e (diff)
downloaddrakx-1c0127d9f80cb91dc16a212f7380f3a45381c0df.tar
drakx-1c0127d9f80cb91dc16a212f7380f3a45381c0df.tar.gz
drakx-1c0127d9f80cb91dc16a212f7380f3a45381c0df.tar.bz2
drakx-1c0127d9f80cb91dc16a212f7380f3a45381c0df.tar.xz
drakx-1c0127d9f80cb91dc16a212f7380f3a45381c0df.zip
no_comment
-rw-r--r--docs/TODO8
-rw-r--r--perl-install/ChangeLog7
-rw-r--r--perl-install/devices.pm7
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps_gtk.pm2
5 files changed, 19 insertions, 7 deletions
diff --git a/docs/TODO b/docs/TODO
index fdd8953d5..d4cb0aaaa 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -112,6 +112,14 @@ rpmdrake proposition for cdrom labels
kernel chosen by default must be the one according to supermount/secure
-fixes needing thinking-----------------------------------------------------------------
+ask network configuration only if NIC found?
+
+xvidtune like screen configuration (see SuSE's yast)
+
+live cdrom for alpha (sparc?)
+
+network boot
+
get the error when getting/reading .rpm files fail
better timeout handling for network installs
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 0b88a7bbe..8c5afb9a3 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,5 +1,12 @@
+2000-02-27 Pixel <pixel@mandrakesoft.com>
+
+ * install2.pm (main): load ide-probe and the like in 'prereq' type
+ so no aliases are added to conf.modules
+
2000-02-25 Pixel <pixel@mandrakesoft.com>
+ * devices.pm (make): small code cleanup
+
* partition_table_raw.pm (adjustEnd): more explicit error message
* fsedit.pm (allocatePartitions): fix a bug (size was getting too
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index 6c3a6a6e4..5ebee431e 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -42,11 +42,8 @@ sub make($) {
if (m,^(.*/(?:dev|tmp))/(.*),) {
$_ = $2;
} else {
- #- lnx4win use a plain swap file, should not assume a leading /tmp or /dev.
- unless (-f $file) {
- $file = "/tmp/$_";
- -e $file or $file = "/dev/$_";
- }
+ -e $file or $file = "/tmp/$_";
+ -e $file or $file = "/dev/$_";
}
-e $file and return $file; #- assume nobody takes fun at creating files named as device
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 73d7071e5..37b90cba8 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -622,7 +622,7 @@ sub main {
modules::read_stage1_conf("/tmp/conf.modules");
modules::read_already_loaded();
- eval { modules::load($_) } foreach qw(ide-probe ide-disk sd_mod af_packet);
+ eval { modules::load($_, 'prereq') } foreach qw(ide-probe ide-disk sd_mod af_packet);
install_any::lnx4win_preinstall() if $o->{lnx4win};
#-the main cycle
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index a95249ed9..1f03f6e78 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -179,7 +179,7 @@ sub new($$) {
exec $_[0], "-dpms","-s" ,"240", "-allowMouseOpenFail", "-xf86config", $f or exit 1;
}
foreach (1..15) {
- sleep 1000;
+ sleep 1;
return 0 if !$ok;
return 1 if c::Xtest($ENV{DISPLAY});
}