From bcc72a8b65862a30e89700f47ee95064b3167a6d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 13 Aug 2012 10:35:25 +0000 Subject: (mkinitrd) style change (needed for next commits) (backported from trunk) --- perl-install/bootloader.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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(); -- cgit v1.2.1