summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-10-08 22:00:52 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-10-08 22:00:52 +0000
commitfc479b2a46849ffe42eb17a3162a38e27900fe93 (patch)
tree571baaa9ab25ea06b356db9ede64b51a0de5ae87 /perl-install/install2.pm
parented6bcf695365fcf77850639267fa3c3633429d86 (diff)
downloaddrakx-fc479b2a46849ffe42eb17a3162a38e27900fe93.tar
drakx-fc479b2a46849ffe42eb17a3162a38e27900fe93.tar.gz
drakx-fc479b2a46849ffe42eb17a3162a38e27900fe93.tar.bz2
drakx-fc479b2a46849ffe42eb17a3162a38e27900fe93.tar.xz
drakx-fc479b2a46849ffe42eb17a3162a38e27900fe93.zip
no_comment
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm14
1 files changed, 4 insertions, 10 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 0c47f513f..2ac1d1430 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -117,7 +117,7 @@ my %suggestedPartitions = (
#-the variable $default)
#-#######################################################################################
$o = $::o = {
-# bootloader => { linear => 0, message => 1, keytable => 1, timeout => 5, restricted => 0 },
+# bootloader => { linear => 0, message => 1, timeout => 5, restricted => 0 },
autoSCSI => 0,
mkbootdisk => 1, #- no mkbootdisk if 0 or undef, find a floppy with 1
#- packages => [ qw() ],
@@ -269,7 +269,7 @@ sub partitionDisks {
return if ($o->{isUpgrade});
$::o->{steps}{formatPartitions}{done} = 0;
- fs::umount_all($o->{fstab}, $o->{prefix}) if $o->{fstab};
+ fs::umount_all($o->{fstab}, $o->{prefix}) if $o->{fstab} && !$::testing;
my $ok = is_empty_array_ref($o->{hds}) ? install_any::getHds($o) : 1;
my $auto = $ok && !$o->{partitioning}{readonly} &&
@@ -421,18 +421,12 @@ sub main {
$o->{partitioning}{auto_allocate} = 1;
} elsif (/--pcmcia/) {
$o->{pcmcia} = shift;
+ } elsif (/--readonly/) {
+ $o->{partitioning}{readonly} = 1;
}
}
- #- if this fails, it's okay -- it might help with free space though
- unlink "/sbin/install" unless $::testing;
- unlink "/sbin/cardmgr" unless $::testing;
unlink "/sbin/insmod" unless $::testing;
- unlink "/sbin/rmmod" unless $::testing;
- unlink "/modules/pcmcia_core.o" unless $::testing;
- unlink "/modules/i82365.o" unless $::testing;
- unlink "/modules/tcic.o" unless $::testing;
- unlink "/modules/ds.o" unless $::testing;
print STDERR "in second stage install\n";
log::openLog(($::testing || $o->{localInstall}) && 'debug.log');