summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-03 13:59:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-03 13:59:51 +0000
commitf91b638be5ee12d0897419272cda6cc8759f6365 (patch)
tree687cc2bd9c6cc5a119d838dc543eabe3534f2750 /perl-install
parent7d4b1b40153f3a53b07552d34281fa7d00f83f55 (diff)
downloaddrakx-f91b638be5ee12d0897419272cda6cc8759f6365.tar
drakx-f91b638be5ee12d0897419272cda6cc8759f6365.tar.gz
drakx-f91b638be5ee12d0897419272cda6cc8759f6365.tar.bz2
drakx-f91b638be5ee12d0897419272cda6cc8759f6365.tar.xz
drakx-f91b638be5ee12d0897419272cda6cc8759f6365.zip
use run_or_die
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm4
-rw-r--r--perl-install/install_steps.pm2
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 20ee4ae75..31fda5d4e 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -84,7 +84,7 @@ sub mkbootdisk($$$;$) {
} else {
push @l, "--bios", 0, if $dev !~ /fd/;
}
- run_program::rooted($prefix, @l, "--device", "/dev/$dev", $kernelVersion) or die "mkbootdisk failed";
+ run_program::rooted_or_die($prefix, @l, "--device", "/dev/$dev", $kernelVersion);
}
sub read($$) {
@@ -613,7 +613,7 @@ sub install_lilo($$) {
log::l("stage2 of lilo used is " . readlink "$prefix/boot/boot.b");
log::l("Installing boot loader...");
$::testing and return;
- run_program::rooted($prefix, "lilo", "2>", "/tmp/.error") or die "lilo failed";
+ run_program::rooted_or_die($prefix, "lilo", "2>", "/tmp/.error");
unlink "$prefix/tmp/.error";
}
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 8270f663d..3b4610cb2 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -371,7 +371,7 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK!
$ENV{DURING_INSTALL} = 1;
pkgs::install($o->{prefix}, $o->{isUpgrade}, \@toInstall, $packages->{depslist}, $packages->{mediums});
delete $ENV{DURING_INSTALL};
- run_program::rooted($o->{prefix}, 'ldconfig') or die "ldconfig failed!" unless $::g_auto_install;
+ run_program::rooted_or_die($o->{prefix}, 'ldconfig') unless $::g_auto_install;
log::l("Install took: ", formatTimeRaw(time - $time));
install_any::log_sizes($o);
}