summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/TODO3
-rw-r--r--perl-install/install2.pm8
-rw-r--r--perl-install/install_steps_gtk.pm4
-rw-r--r--perl-install/install_steps_interactive.pm3
-rw-r--r--perl-install/modules.pm14
-rw-r--r--perl-install/mouse.pm2
-rw-r--r--perl-install/pkgs.pm2
7 files changed, 20 insertions, 16 deletions
diff --git a/docs/TODO b/docs/TODO
index 4f01254e4..51f17c1a9 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -47,6 +47,8 @@ add fdisk using the zvt widget (taken in gnome-libs)
ability to add nfs/weird_fs entries in fstab
+size of packages in crypto
+
-to test--------------------------------------------------------------------------------
what's lseek64?
@@ -159,6 +161,7 @@ XFdrake chooseResolutions with ask_from_list do not permit ``Show all''
-hardware-------------------------------------------------------------------------------
- with no floppy drive, mkbootdisk step fails badly
+- with bad floppy or write protected, mkbootdisk doesn't say anything
- try detect_devices::floppies (and how are scsi floppies handled?)
maybe: do a iotcl FDGETPRM to detect fd1, fd0.
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 53ff1412b..b8c5c079b 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -46,7 +46,7 @@ my (%installSteps, @orderedInstallSteps);
selectMouse => [ __("Configure mouse"), 1, 1, '$::beginner', "selectInstallClass" ],
selectKeyboard => [ __("Choose your keyboard"), 1, 1, '', "selectInstallClass" ],
miscellaneous => [ __("Miscellaneous"), 1, 1, '$::beginner' ],
- partitionDisks => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass" ],
+ partitionDisks => [ __("Setup filesystems"), 1, 0, '$o->{lnx4win}', "selectInstallClass" ],
formatPartitions => [ __("Format partitions"), 1, -1, '', "partitionDisks" ],
choosePackages => [ __("Choose packages to install"), 1, -2, '$::beginner', "formatPartitions" ],
doInstallStep => [ __("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"] ],
@@ -58,11 +58,11 @@ my (%installSteps, @orderedInstallSteps);
setRootPassword => [ __("Set root password"), 1, 1, '', "formatPartitions" ],
addUser => [ __("Add a user"), 1, 1, '' ],
arch() !~ /alpha/ ? (
- createBootdisk => [ __("Create a bootdisk"), 1, 0, '', "doInstallStep" ],
+ createBootdisk => [ __("Create a bootdisk"), 1, 0, '$::o->{lnx4win} && !$::expert', "doInstallStep" ],
) : (),
- setupBootloader => [ __("Install bootloader"), 1, 1, '', "doInstallStep" ],
+ setupBootloader => [ __("Install bootloader"), 1, 1, '$::o->{lnx4win} && !$::expert', "doInstallStep" ],
configureX => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"] ],
- generateAutoInstFloppy => [ __("Auto install floppy"), 1, 1, '!$::corporate || !$::expert', "doInstallStep" ],
+ generateAutoInstFloppy => [ __("Auto install floppy"), 1, 1, '!$::expert || $o->{lnx4win}', "doInstallStep" ],
exitInstall => [ __("Exit install"), 0, 0, '$::beginner' ],
);
for (my $i = 0; $i < @installSteps; $i += 2) {
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 715b96f27..b2f6f4a57 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -196,7 +196,7 @@ sub doPartitionDisks {
} elsif ($@ =~ /not enough room/) {
$o->ask_warn('', _("You don't have any enough room for Lnx4win"));
} else { return }
- delete $o->{lnx4win};
+#- delete $o->{lnx4win};
}
if ($::beginner && fsedit::is_one_big_fat($hds)) {
#- wizard
@@ -558,7 +558,7 @@ sub installPackages {
$nb = $_[0];
$total_size = $_[1]; $current_total_size = 0;
$start_time = time();
- $msg->set(_("%d packages", $nb) . _(", %U MB", pkgs::correctSize($total_size / sqr(1024))));
+ $msg->set(_("%d packages", $nb) . _(", %U MB", $total_size / sqr(1024)));
$w->flush;
} elsif ($m =~ /^Starting installing package/) {
$progress->update(0);
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 0ed7681a6..a21f57d68 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1026,7 +1026,7 @@ Do you want to try XFree 4.0?")) if $::expert;
sub generateAutoInstFloppy($) {
my ($o) = @_;
- $::expert && $::corporate || $::g_auto_install or return;
+ $::expert || $::g_auto_install or return;
my ($floppy) = detect_devices::floppies();
@@ -1047,6 +1047,7 @@ sub generateAutoInstFloppy($) {
fs::mount($dev, "/floppy", "vfat", 0);
substInFile { s/timeout.*//; s/^(\s*append)/$1 kickstart=floppy/ } "/floppy/syslinux.cfg";
+ unlink "/floppy/help.msg";
output "/floppy/ks.cfg", install_any::generate_ks_cfg($o);
output "/floppy/boot.msg", "\n0c",
"!! If you press enter, an auto-install is going to start.
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 3a3ea2811..198bc118f 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -160,14 +160,14 @@ arch() =~ /^sparc/ ? (
[ 'cdrom', {
arch() !~ /^sparc/ ? (
"sbpcd" => "SoundBlaster/Panasonic",
- "aztcd" => "Aztech CD",
- "gscd" => "Goldstar R420",
-#- "isp16" => "ISP16/MAD16/Mozart", #- removed for space
+#- "aztcd" => "Aztech CD",
+#- "gscd" => "Goldstar R420",
+#- "isp16" => "ISP16/MAD16/Mozart",
#- "mcd" => "Mitsumi", #- removed for space
-#- "mcdx" => "Mitsumi (alternate)", #- removed for space
- "optcd" => "Optics Storage 8000",
- "cm206" => "Phillips CM206/CM260",
- "sjcd" => "Sanyo",
+#- "mcdx" => "Mitsumi (alternate)",
+#- "optcd" => "Optics Storage 8000",
+#- "cm206" => "Phillips CM206/CM260",
+#- "sjcd" => "Sanyo",
"cdu31a" => "Sony CDU-31A",
"sonycd535" => "Sony CDU-5xx",
) : (),
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index f939e3fe0..1f9183462 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -42,7 +42,7 @@ arch() =~ /^sparc/ ? (
[ 2, "inportbm", "Busmouse", "BusMouse", __("Microsoft Bus Mouse") ],
[ 3, "logibm", "Busmouse", "BusMouse", __("Logitech Bus Mouse") ],
[ 2, "usbmouse", "ps/2", "PS/2", __("USB Mouse") ],
- [ 3, "usbmouse", "ps/2", "PS/2", __("USB Mouse (3 buttons or more)") ],
+ [ 3, "usbmouse", "ps/2", "IMPS/2", __("USB Mouse (3 buttons or more)") ],
),
[ 0, "none", "none", "Microsoft", __("No Mouse") ],
[ 2, "ttyS", "pnp", "Auto", __("Microsoft Rev 2.1A or higher (serial)") ],
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 4c1ad4536..49414b4b1 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -82,7 +82,7 @@ autoirpm autoirpm-icons numlock
'zh_TW.Big5' => [ 'rxvt-CLE', 'fonts-ttf-big5' ],
);
-@preferred = qw(perl-GTK postfix ghostscript-X vim-minimal kernel);
+@preferred = qw(perl-GTK postfix ghostscript-X vim-minimal kernel ispell-en);
#- constant for small transaction.
$limitMinTrans = 8;