[Mageia-dev] [soft-commits] [5526] (mkinitrd) More logging on why initrd generation is skipped

[Thierry Vignaud]

On 1 September 2012 16:40,  <root at mageia.org> wrote:
> (mkinitrd) More logging on why initrd generation is skipped

I would have prefer to see this as a temporary patch :-(

> --- drakx/trunk/perl-install/bootloader.pm	2012-09-01 14:40:52 UTC (rev
> 5525)
> +++ drakx/trunk/perl-install/bootloader.pm	2012-09-01 14:40:53 UTC (rev
> 5526)
> @@ -110,10 +110,19 @@
>      my ($kernel_version, $bootloader, $entry, $initrd) = @_;
>
>      my $dir = dirname($initrd);
> -    return $initrd if $::testing  # testing mode
> -      || -e "$::prefix/$initrd"   # already exists
> -        || $initrd =~ /\(hd/      # unrecognized partition
> -          || !-d "$::prefix/$dir";# dir doesn't exist (probably !mounted
> foreign part)
> +    if ($::testing) {
> +      log::l("Skipping initrd generation: testing mode");
> +      return $initrd;
> +    } elsif (-e "$::prefix/$initrd") {
> +      log::l("Skipping initrd generation: already exists");
> +      return $initrd;
> +    } elsif ($initrd =~ /\(hd/) {
> +      log::l("Skipping initrd generation: unrecognized partition");
> +      return $initrd;
> +    } elsif (!-d "$::prefix/$dir") {
> +      log::l("Skipping initrd generation: dir doesn't exist (probably
> !mounted foreign part)");
> +      return $initrd;
> +    }