summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-08-07 10:37:16 +0000
committerThierry Vignaud <tv@mageia.org>2012-08-07 10:37:16 +0000
commit3e2bd49f933ab33caa1d57cdb07c664aca0641e7 (patch)
tree6b717bb4f94eb1936541beba821cdc3e708b8bb7 /perl-install
parent4913278dcca48d40955f8b43e5a6b2b8045b4130 (diff)
downloaddrakx-3e2bd49f933ab33caa1d57cdb07c664aca0641e7.tar
drakx-3e2bd49f933ab33caa1d57cdb07c664aca0641e7.tar.gz
drakx-3e2bd49f933ab33caa1d57cdb07c664aca0641e7.tar.bz2
drakx-3e2bd49f933ab33caa1d57cdb07c664aca0641e7.tar.xz
drakx-3e2bd49f933ab33caa1d57cdb07c664aca0641e7.zip
(mkinitrd) style change (needed for next commits)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 757b3022e..4d71798f6 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -109,7 +109,8 @@ sub get_label {
sub mkinitrd {
my ($kernel_version, $bootloader, $entry, $initrd) = @_;
- $::testing || -e "$::prefix/$initrd" and return $initrd;
+ return $initrd if $::testing # testing mode
+ || -e "$::prefix/$initrd"; # already exists
# for /boot on dos partitions when installing on loopback file on dos partition
my $loop_boot = fs::loopback::prepare_boot();