[Merge] ~bdrung/ubuntu/+source/initramfs-tools:ubuntu/devel-drm into ~ubuntu-core-dev/ubuntu/+source/initramfs-tools:ubuntu/devel

[Daniel van Vugt]

Review: Needs Information



Diff comments:

> diff --git a/hooks/framebuffer b/hooks/framebuffer
> index c559efd..336fc85 100755
> --- a/hooks/framebuffer
> +++ b/hooks/framebuffer
> @@ -19,25 +19,10 @@ esac
>  
>  . /usr/share/initramfs-tools/hook-functions
>  
> -manual_add_modules "=drivers/gpu/drm/tiny" \
> -	fbcon vesafb vga16fb vboxvideo simplefb efifb virtio-gpu
> -
> -# if there is a privacy screen then its driver must be loaded before the
> -# kms driver will bind, otherwise its probe() will return -EPROBE_DEFER
> -# So include privacy screen providers
> -# atm all providers live under drivers/platform/x86
> -manual_add_modules -s "drm_privacy_screen_register" "=drivers/platform/x86"
> -
> -for x in "${MODULESDIR}"/initrd/*; do
> -	x=${x##*/}
> -	x=${x%.*}
> -	case ${x} in
> -	'*')
> -		break
> -		;;
> -	*fb)
> -		;;
> -	esac
> -
> -	manual_add_modules "${x}"
> -done
> +if [ "${MODULES-}" = "dep" ]; then

Is this a typo?

> +	if [ -e /sys/class/drm ]; then
> +		class_add_modules drm
> +	fi
> +elif [ "$MODULES" != "list" ]; then

Probably should use the same syntax as above.

> +	auto_add_modules fbdev minimal_drm
> +fi


-- 
https://code.launchpad.net/~bdrung/ubuntu/+source/initramfs-tools/+git/initramfs-tools/+merge/462691
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/ubuntu/+source/initramfs-tools:ubuntu/devel.