Re: [PATCH mkinitrd 5.4 fips] Fix kernel integrity check with cciss (#505108)

[Peter Jones <pjones redhat com>]

On 06/16/2009 01:52 PM, Hans de Goede wrote:
> diff -up mkinitrd-5.1.19.6/mkinitrd~ mkinitrd-5.1.19.6/mkinitrd
> --- mkinitrd-5.1.19.6/mkinitrd~	2009-06-12 14:30:37.000000000 +0200
> +++ mkinitrd-5.1.19.6/mkinitrd	2009-06-12 14:35:51.000000000 +0200
> @@ -1193,9 +1193,19 @@ if [ "$withfips" -eq 1 ]; then
>  
>      if [[ "$bootdev" =~ ^(LABEL=|UUID=) ]]; then
>          devname=$(resolve_device_name $bootdev)
> -        findstoragedriver ${devname##/dev/}
>      else
> -        findstoragedriver ${bootdev##/dev/}
> +        devname=$bootdev
> +    fi
> +    devname=${devname##/dev/}
> +
> +    # cciss is *very* special not only does its devicename contain a / which
> +    # must be translated to a ! in sysfs, doing the translation is not enough
> +    # as cciss' /sys/block entries lack a device symlink (great guys, really
> +    # great!) so just hardcode it
> +    if [[ "$devname" =~ "^cciss/" ]]; then
> +        findmodule cciss
> +    else
> +        findstoragedriver $devname
>      fi
>  
>      BOOTMODULES="$MODULES"

This is fine.

-- 
        Peter

I'd like to start a religion. That's where the money is.
		-- L. Ron Hubbard to Lloyd Eshbach, in 1949;
			quoted by Eshbach in _Over My Shoulder_.