summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-20 22:19:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-20 22:19:00 +0000
commitcaa013bea3a978cddcba4dc9ffe0ee577dbcf7cb (patch)
tree0d7e6a264c06222497a4a1f36cfceb46016934fd /perl-install
parent987e71cbb903383c39f4074a84b765e543b34fdd (diff)
downloaddrakx-backup-do-not-use-caa013bea3a978cddcba4dc9ffe0ee577dbcf7cb.tar
drakx-backup-do-not-use-caa013bea3a978cddcba4dc9ffe0ee577dbcf7cb.tar.gz
drakx-backup-do-not-use-caa013bea3a978cddcba4dc9ffe0ee577dbcf7cb.tar.bz2
drakx-backup-do-not-use-caa013bea3a978cddcba4dc9ffe0ee577dbcf7cb.tar.xz
drakx-backup-do-not-use-caa013bea3a978cddcba4dc9ffe0ee577dbcf7cb.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ChangeLog13
-rw-r--r--perl-install/bootloader.pm29
-rw-r--r--perl-install/common.pm2
-rw-r--r--perl-install/install_steps_interactive.pm2
4 files changed, 37 insertions, 9 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 08503025c..bffb18ada 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,12 @@
+2000-09-20 Pixel <pixel@mandrakesoft.com>
+
+ * bootloader.pm (install_loadlin_config_sys,
+ install_loadlin_desktop): extracted from install_loadlin, do not
+ call them anymore (remove it?)
+ (suggest): put grub in lnx4win install
+
+ * common.pm (availableRamMB): fixed (round to a multiple of 4)
+
2000-09-20 dam's <damien@mandrakesoft.com>
* netconnect.pm (get_info_isdn_providers & read_isdn_providers):
@@ -5,6 +14,10 @@
(isdn_write_config): corrected file to be sh compliant.
(isdn_write_config): added default route settings for isdn.
+2000-09-20 DrakX <install@linux-mandrake.com>
+
+ * snapshot uploaded
+
2000-09-20 Pixel <pixel@mandrakesoft.com>
* pci_probing/pcitable: replace es1371 by snd-card-ens1371
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 26443ee63..981b9d134 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -312,7 +312,7 @@ wait %d seconds for default boot.
my %l = (
silo => bool(arch() =~ /sparc/),
lilo => bool(arch() !~ /sparc/) && !isLoopback(fsedit::get_root($fstab)),
- grub => bool(arch() !~ /sparc/) && !$::o->{lnx4win}, #1,#!isReiserfs(fsedit::get_root($fstab, 'boot')),
+ grub => bool(arch() !~ /sparc/), #!isReiserfs(fsedit::get_root($fstab, 'boot')),
loadlin => bool(arch() !~ /sparc/) && -e "/initrd/loopfs/lnx4win",
);
$lilo->{methods} ||= { map { $_ => 1 } grep { $l{$_} } keys %l };
@@ -642,12 +642,27 @@ sub install_loadlin {
my $windrive = $winhandle->{dir};
log::l("windrive is $windrive");
+ my ($label, $cmd) = loadlin_cmd($prefix, $lilo);
+
+ #install_loadlin_config_sys($lilo, $windrive, $label, $cmd);
+ #install_loadlin_desktop($lilo, $windrive);
+
+ output "/initrd/loopfs/lnx4win/linux.bat", unix2dos(
+'@echo off
+echo Linux Mandrake
+smartdrv /C
+' . "$cmd\n");
+
+}
+
+sub install_loadlin_config_sys {
+ my ($lilo, $windrive, $label, $cmd) = @_;
+
my $config_sys = "$windrive/config.sys";
local $_ = cat_($config_sys);
output "$windrive/config.mdk", $_ if $_;
my $timeout = $lilo->{timeout} || 1;
- my ($label, $cmd) = loadlin_cmd($prefix, $lilo);
$_ = "
[Menu]
@@ -669,12 +684,10 @@ menudefault=Windows,$timeout
shell=$cmd
";
output $config_sys, unix2dos($_);
- output "/initrd/loopfs/lnx4win/linux.bat", unix2dos(
-'@echo off
-echo Linux Mandrake
-smartdrv /C
-' . "$cmd\n");
+}
+sub install_loadlin_desktop {
+ my ($lilo, $windrive) = @_;
my $windir = lc(cat_("$windrive/msdos.sys") =~ /^WinDir=.:\\(\S+)/m ? $1 : "windows");
#-PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
@@ -690,9 +703,9 @@ IconFile=%s
IconIndex=0
), lnx4win_file($lilo, "/", "/lnx4win.ico"));
}
-
}
+
sub install {
my ($prefix, $lilo, $fstab, $hds) = @_;
diff --git a/perl-install/common.pm b/perl-install/common.pm
index ca86f0459..47cc2586f 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -564,7 +564,7 @@ sub typeFromMagic($@) {
}
sub availableMemory() { sum map { /(\d+)/ } grep { /^(MemTotal|SwapTotal):/ } cat_("/proc/meminfo"); }
-sub availableRamMB() { divide((stat("/proc/kcore"))[7], 1024 * 1024) + 1 }
+sub availableRamMB() { 4 * int ((stat("/proc/kcore"))[7] / 1024 / 1024 / 4 + 0.5) }
sub setVirtual($) {
my $vt = '';
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index b2da1209f..6a2a27791 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -973,6 +973,8 @@ Do you really want to quit now?"), 0);
install_steps::exitInstall;
+ $o->exit unless $alldone;
+
$o->ask_warn('',
_("Congratulations, installation is complete.
Remove the boot media and press return to reboot.