diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-08-13 10:35:25 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-08-13 10:35:25 +0000 |
| commit | bcc72a8b65862a30e89700f47ee95064b3167a6d (patch) | |
| tree | aadf7817c1acaa7efe287620cd1d1579e4e74185 | |
| parent | e11d4cf3752c5b1b867083a1054da1517c560b7c (diff) | |
| download | drakx-bcc72a8b65862a30e89700f47ee95064b3167a6d.tar drakx-bcc72a8b65862a30e89700f47ee95064b3167a6d.tar.gz drakx-bcc72a8b65862a30e89700f47ee95064b3167a6d.tar.bz2 drakx-bcc72a8b65862a30e89700f47ee95064b3167a6d.tar.xz drakx-bcc72a8b65862a30e89700f47ee95064b3167a6d.zip | |
(mkinitrd) style change (needed for next commits)
(backported from trunk)
| -rw-r--r-- | perl-install/bootloader.pm | 3 |
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(); |