summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-13 22:03:33 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-13 22:03:33 +0000
commit23c152b7d199b290607b3d3e3a14d76dbaa60e90 (patch)
tree495014e3fa3d0e8266f5d243381bbcbb94ae35be /perl-install/install_steps.pm
parentb121ba06131e915ff2dd837c8d7d0bd13fb3ac40 (diff)
downloaddrakx-23c152b7d199b290607b3d3e3a14d76dbaa60e90.tar
drakx-23c152b7d199b290607b3d3e3a14d76dbaa60e90.tar.gz
drakx-23c152b7d199b290607b3d3e3a14d76dbaa60e90.tar.bz2
drakx-23c152b7d199b290607b3d3e3a14d76dbaa60e90.tar.xz
drakx-23c152b7d199b290607b3d3e3a14d76dbaa60e90.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm11
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 584bf1fb3..4736a98c9 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -40,7 +40,6 @@ sub new($$) {
sub enteringStep($$) {
my ($o, $step) = @_;
log::l("starting step `$step'");
- $o->kill;
for (my $s = $o->{steps}{first}; $s; $s = $o->{steps}{$s}{next}) {
@@ -69,7 +68,8 @@ so continue at your own risk :("), $@ ]) if $@;
}
}
-sub errorInStep($$) {}
+sub errorInStep($$) { print "error :(\n"; exit 1 }
+sub kill_action {}
#-######################################################################################
@@ -99,7 +99,8 @@ sub setupSCSI { modules::load_thiskind('scsi') }
#------------------------------------------------------------------------------
sub doPartitionDisks($$) {
my ($o, $hds) = @_;
- fsedit::auto_allocate($hds, $o->{partitions});
+ return if $::testing;
+ partition_table::write($_) foreach $hds;
}
#------------------------------------------------------------------------------
@@ -210,8 +211,7 @@ sub setRootPassword($) {
$u{password} = crypt_($u{password}) if $u{password};
- my $f = "$p/etc/passwd";
- my @lines = cat_($f, "failed to open file $f");
+ my @lines = cat_(my $f = "$p/etc/passwd") or log::l("missing passwd file"), return;
local *F;
open F, "> $f" or die "failed to write file $f: $!\n";
@@ -273,6 +273,7 @@ sub createBootdisk($) {
#------------------------------------------------------------------------------
sub setupBootloader($) {
my ($o) = @_;
+ return if $::g_auto_install;
my $versionString = versionString();
lilo::install($o->{prefix}, $o->{hds}, $o->{fstab}, $versionString, $o->{bootloader});
}