summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/fs.pm6
-rw-r--r--perl-install/fsedit.pm2
-rw-r--r--perl-install/install2.pm6
-rw-r--r--perl-install/install_steps.pm3
-rw-r--r--perl-install/install_steps_interactive.pm2
5 files changed, 5 insertions, 14 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 4257ad62c..35261956f 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -141,7 +141,7 @@ sub write_fstab {
$_->{device} eq 'none' || member($_->{type}, qw(nfs smbfs)) ?
$_->{device} :
isLoopback($_) ?
- ($_->{mntpoint} eq '/' ? "/initrd/loopfs$_->{loopback_file}" : $_->{device}) :
+ ($_->{mntpoint} eq '/' ? "/initrd/loopfs" : "$_->{loopback_device}{mntpoint}") . $_->{loopback_file} :
do {
my $dir = $_->{device} =~ m|^/| ? '' : '/dev/';
eval { devices::make("$prefix$dir$_->{device}") };
@@ -354,7 +354,7 @@ sub set_default_options {
if (isThisFs('reiserfs', $part)) {
$options->{notail} = 1;
}
- if (isLoopback($_) && !isSwap($_)) { #- no need for loop option for swap files
+ if (isLoopback($part) && !isSwap($part)) { #- no need for loop option for swap files
$options->{loop} = 1;
}
@@ -640,7 +640,7 @@ sub mount_part {
if (isSwap($part)) {
swap::swapon($part->{device});
} else {
- $part->{mntpoint} or die "missing mount point";
+ $part->{mntpoint} or die "missing mount point for partition $part->{device}";
my $dev = $part->{device};
my $mntpoint = ($prefix || '') . $part->{mntpoint};
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 2c4cd0e66..2846021da 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -80,7 +80,7 @@ sub empty_all_hds {
sub recompute_loopbacks {
my ($all_hds) = @_;
my @fstab = get_all_fstab($all_hds);
- $all_hds->{loopbacks} = [ map { isPartOfLoopback($_) ? @{$_->{loopback}} : () } @fstab ];
+ @{$all_hds->{loopbacks}} = map { isPartOfLoopback($_) ? @{$_->{loopback}} : () } @fstab;
}
sub hds {
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 8bc57a176..3ea701720 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -174,12 +174,6 @@ sub formatPartitions {
require raid;
raid::prepare_prefixed($o->{all_hds}{raids}, $o->{prefix});
- my $d = "/initrd/loopfs/lnx4win";
- if (-d $d) {
-#- install_any::useMedium(0);
- install_any::getAndSaveFile("lnx4win/$_", "$d/$_") foreach qw(ctl3d32.dll loadlin.exe linux.pif lnx4win.exe lnx4win.ico rm.exe uninstall.bat uninstall.pif);
- }
-
#- chdir "$o->{prefix}"; was for core dumps
#-noatime option for ext2 fs on laptops (do not wake up the hd)
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 7c25d3262..d13d2d8fc 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -859,9 +859,6 @@ sub miscellaneous {
local $_ = $o->{bootloader}{perImageAppend};
- if ($o->{lnx4win} and !/mem=/) {
- $_ .= ' mem=' . availableRamMB() . 'M';
- }
if (my @l = detect_devices::IDEburners() and !/ide-scsi/) {
$_ .= " " . join(" ", (map { "$_->{device}=ide-scsi" } @l),
#- in that case, also add ide-floppy otherwise ide-scsi will be used!
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 3e61b1470..d492f08ac 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -415,7 +415,7 @@ sub formatMountPartitions {
my ($part) = @_;
$w ||= $o->wait_message('', _("Formatting partitions"));
$w->set(isLoopback($part) ?
- _("Creating and formatting file %s", $part->{device}) :
+ _("Creating and formatting file %s", $part->{loopback_file}) :
_("Formatting partition %s", $part->{device}));
});
die _("Not enough swap to fulfill installation, please add some") if availableMemory < 40 * 1024;