summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/README4
-rw-r--r--docs/TODO51
-rw-r--r--perl-install/ChangeLog19
-rw-r--r--perl-install/Xconfigurator.pm6
-rw-r--r--perl-install/fs.pm11
-rw-r--r--perl-install/install_any.pm4
-rw-r--r--perl-install/install_steps_interactive.pm24
-rw-r--r--perl-install/partition_table.pm2
8 files changed, 73 insertions, 48 deletions
diff --git a/docs/README b/docs/README
index 781867732..ae294a8a0 100644
--- a/docs/README
+++ b/docs/README
@@ -58,8 +58,8 @@ Mandrake/base/compssUsers
Mandrake/base/compssList
for each packages, it gives the appreciation for each type of user.
- used to preselect packages
- used to decide to show or hide packages.
+ used to choose packages
+ (see beginning of perl-install/pkgs.pm for more)
Mandrake/mdkinst
live system used on certain installs. See ``Ramdisk or not'' below for
diff --git a/docs/TODO b/docs/TODO
index 74dea0217..8adbccaa3 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -5,7 +5,18 @@ relative to 7.0-2.
diskdrake can olverlap partitions (resize lower, resize original typically
after clear all and auto allocate, try maximal size available).
+
+-to test--------------------------------------------------------------------------------
+fstab must be sorted (/usr/local after /usr)
+
+in chooseResolutions: display the graphic card found
+
+diskdrake should warn if nb_ide_parts > 63, nb_scsi_parts > 15
+
+
-choices--------------------------------------------------------------------------------
+tree for choosing things like timezone, monitors, graphic cards, modules, keyboard? ...
+
index/compress hdlist?
checkboxes in groups based on compssList (and availableSpace?)
@@ -20,8 +31,6 @@ crypto: add a cancel & progress bar while downloading
error handling (like reading hdlist)
-get the error when reading .rpm files fail
-
diskdrake in text mode
add fdisk using the zvt widget (taken in gnome-libs)
@@ -55,32 +64,15 @@ auto ppp-configure with free provider
-easy fixes-----------------------------------------------------------------------------
-usb module not removed if no mouse found
-
-(small)urpmi: handle many args on cmd-line
-
-fstab must be sorted (/usr/local after /usr)
-
configure DHCP for newbies if ethernet & DHCP card available
rpmdrake proposition for cdrom labels
-fix any // in path to ftp server otherwise windobe server bug :(
-
-(?) Je viens de faire une installation sur une machine o� seul Be �tait
-install�. Je l'ai supprim� et install� (mode recommand�) Oxygen. Au
-red�marrage, le boot manager de Be appara�t et il est impossible de
-d�marrer Linux.
-Pourquoi ne pas installer LILO si on supprime toutes les partitions ?
-
-(?) Xconfiguration: if "can't open fixed font", relaunch xfs.
-
-(?) in chooseResolutions: display the graphic card found
-
-(?) diskdrake should warn if nb_ide_parts > 63, nb_scsi_parts > 15
-
-fixes needing thinking-----------------------------------------------------------------
+get the error when getting/reading .rpm files fail
+better timeout handling for network installs
+
handle not enough room for update
(fpons)verify the free space is big enough.
@@ -159,6 +151,8 @@ aha152x needs "insmod aha152x.o aha152x=0x140,11,7"
try detect_devices::floppies (and how are scsi floppies handled?)
maybe: do a iotcl FDGETPRM to detect fd1, fd0.
+usb module not removed if no mouse found
+
(fpons)handle dat drives
hibernation on laptop -> clock not restored
@@ -170,6 +164,14 @@ eg: SIS6326 needs "no_bitblt" "no_bltimage" and 24bpp instead of 32bpp
-(?)---------------------------------------------------------------------------------
+(?) Xconfiguration: if "can't open fixed font", relaunch xfs.
+
+(?) Je viens de faire une installation sur une machine o� seul Be �tait
+install�. Je l'ai supprim� et install� (mode recommand�) Oxygen. Au
+red�marrage, le boot manager de Be appara�t et il est impossible de
+d�marrer Linux.
+Pourquoi ne pas installer LILO si on supprime toutes les partitions ?
+
(?)initrd in bzip2
(?)smaller zsh (or ash in initrd)
@@ -389,3 +391,8 @@ peut en sortir. La seule solution est de red�marrer.
(obsolete)bug when selecting compssUsers, do not deselect after (if u deselect)
(done,pix)detect ide burners and then add hdX=ide-scsi to kernel cmdline
+
+(done,pix)urpmi: handle many args on cmd-line
+
+(done,pix)fix any // in path to ftp server otherwise windobe server bug :(
+
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 8ee73ed1f..66912f974 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,22 @@
+2000-02-09 Pixel <pixel@mandrakesoft.com>
+
+ * partition_table.pm (add): cdie if maximum number of partitions
+ handled by linux is reached
+
+ * Xconfigurator.pm (chooseResolutionsGtk): display the graphic
+ card or server found
+
+ * install_any.pm (relGetFile): for mdkinst files, take care not to
+ have a double '/' (see debbugs #591)
+
+ * install_steps_interactive.pm (configureNetwork):
+ purpose: add ability to configure both modem and lan
+ clean up the behaviour
+
+ * fs.pm (write_fstab):
+ purpose: sort the fstab per mount point (cuz /usr must be before /usr/local)
+ also: rewrite of the part writing the fstab.
+
1999-12-19 Pixel <pixel@mandrakesoft.com>
* install2.pm (configureX): write current fstab and conf.modules
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index fd73f0a3f..d48df057d 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -472,7 +472,11 @@ sub chooseResolutionsGtk($$;$) {
});
}
gtkadd($W->{window},
- gtkpack_($W->create_box_with_title(_("Choose resolution and color depth")),
+ gtkpack_($W->create_box_with_title(_("Choose resolution and color depth"),
+ "(" . ($o->{card}{type} ?
+ _("Graphic card: %s\n", $o->{card}{type}) :
+ _("XFree86 server: %s\n", $o->{card}{server})) . ")"
+ ),
1, gtkpack(new Gtk::HBox(0,20),
$depth_combo = new Gtk::Combo,
gtkpack_(new Gtk::VBox(0,0),
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index c3f960cd8..390221732 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -284,17 +284,14 @@ sub write_fstab($;$$) {
} grep { isFat($_) &&
! exists $new{"/dev/$_->{device}"} } @$fstab;
- my @current = cat_("$prefix/etc/fstab");
+ push @to_add,
+ sort { $a->[1] cmp $b->[1] }
+ grep { !exists $new{$_->[0]} && !exists $new{$_->[1]} }
+ map { [ split ] } cat_("$prefix/etc/fstab");
log::l("writing $prefix/etc/fstab");
local *F;
open F, "> $prefix/etc/fstab" or die "error writing $prefix/etc/fstab";
- foreach (@current) {
- my ($a, $b) = split;
- #- if we find one line of fstab containing either the same device or mntpoint, do not write it
- exists $new{$a} || exists $new{$b} and next;
- print F $_;
- }
print F join(" ", @$_), "\n" foreach @to_add;
}
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 1d4c324a2..b84cd3c4b 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -36,8 +36,8 @@ sub relGetFile($) {
local $_ = $_[0];
/\.img$/ and return "images/$_";
my $dir = m|/| ? "mdkinst" :
- member($_, qw(compss compssList compssUsers depslist hdlist)) ? "base" : "RPMS";
- $_ = "Mandrake/$dir/$_";
+ member($_, qw(compss compssList compssUsers depslist hdlist)) ? "/base" : "/RPMS";
+ $_ = "Mandrake/$dir$_";
s/i386/i586/;
$_;
}
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index ddafab251..2cb1e567f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -348,26 +348,22 @@ sub afterInstallPackages($) {
sub configureNetwork($) {
my ($o, $first_time) = @_;
local $_;
- if ($o->{intf}) {
- if (!$::beginner && $first_time || $::expert) {
- my @l = (
- __("Keep the current IP configuration"),
- __("Reconfigure network now"),
- __("Do not set up networking"),
- );
- $_ = $o->ask_from_list_([ _("Network Configuration") ],
- _("Local networking has already been configured. Do you want to:"),
- [ @l ]) || "Do not";
- } else { $_ = "Keep"; }
- } elsif ($o->{modem}) {
- $_ = "Dialup";
+ if ($o->{intf} && $first_time) {
+ my @l = (
+ __("Keep the current IP configuration"),
+ __("Reconfigure network now"),
+ __("Do not set up networking"),
+ );
+ $_ = $::beginner ? "Keep" :
+ $o->ask_from_list_([ _("Network Configuration") ],
+ _("Local networking has already been configured. Do you want to:"),
+ [ @l ]) || "Do not";
} else {
$_ = $::beginner ? "Do not" :
$o->ask_from_list_([ _("Network Configuration") ],
_("Do you want to configure networking for your system?"),
[ __("Local LAN"), __("Dialup with modem"), __("Do not set up networking") ]);
}
-
if (/^Dialup/) {
$o->pppConfig;
} elsif (/^Do not/) {
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 16c8a6b0c..518734f5a 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -531,6 +531,8 @@ The only solution is to move your primary partitions to have the hole next to th
sub add($$;$$) {
my ($hd, $part, $primaryOrExtended, $forceNoAdjust) = @_;
+ get_normal_parts($hd) >= ($hd->{device} =~ /^sd/ ? 15 : 63) and cdie "maximum number of partitions handled by linux reached";
+
$part->{notFormatted} = 1;
$part->{isFormatted} = 0;
$part->{rootDevice} = $hd->{device};