[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH f14-branch master] Pull boot splash image from correct location (#635330)



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/19/2010 06:17 PM, Brian C. Lane wrote:
> Boot splash images are in /usr/share/anaconda/boot as per
> https://fedoraproject.org/wiki/F14_Artwork/Fedora-Logos-Packaging
> 
> Add failure exit if no boot splash image is found.
> ---
>  scripts/mk-images.x86 |   13 ++++++++-----
>  1 files changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86
> index 7ff41ad..1a34408 100644
> --- a/scripts/mk-images.x86
> +++ b/scripts/mk-images.x86
> @@ -37,8 +37,8 @@ prepareBootTree() {
>  	ln $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img
>  	cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz
>  
> -	if [ -f $IMGPATH/usr/share/anaconda/syslinux-vesa-splash.jpg ]; then
> -		cp $IMGPATH/usr/share/anaconda/syslinux-vesa-splash.jpg $MBD_BOOTTREE/splash.jpg
> +	if [ -f $IMGPATH/usr/share/anaconda/boot/syslinux-vesa-splash.jpg ]; then
> +		cp $IMGPATH/usr/share/anaconda/boot/syslinux-vesa-splash.jpg $MBD_BOOTTREE/splash.jpg
>  		cp $IMGPATH/usr/share/syslinux/vesamenu.c32 $MBD_BOOTTREE/vesamenu.c32
>  		sed -i s'/default linux/default vesamenu.c32/g' $MBD_BOOTTREE/syslinux.cfg
>  		sed -i 's/prompt 1/#prompt 1/g' $MBD_BOOTTREE/syslinux.cfg
> @@ -47,10 +47,13 @@ prepareBootTree() {
>  		if [ $? != 0 ]; then
>  		    echo $0: Failed to create splash.lss
>  		    exit 1
> -		fi    
> +		fi
>  		cp $BOOTDISKDIR/splash.lss $MBD_BOOTTREE/splash.lss
> -	elif [ -f $IMGPATH/usr/share/anaconda/splash.lss ]; then
> -		cp $IMGPATH/usr/share/anaconda/splash.lss $MBD_BOOTTREE/splash.lss
> +	elif [ -f $IMGPATH/usr/share/anaconda/boot/splash.lss ]; then
> +		cp $IMGPATH/usr/share/anaconda/boot/splash.lss $MBD_BOOTTREE/splash.lss
> +	else
> +		echo Failed to find or create splash image
> +		exit 1
>  	fi
>  
>  	rm -f $MBD_BOOTTREE/syslinux-splash.png

Ack!

- -- 
Jesse Keating
Fedora -- FreedomĀ² is a feature!
identi.ca: http://identi.ca/jkeating
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAkyXkg8ACgkQ4v2HLvE71NWe9wCfQzhJ2lngjm1vW5SgyZwoYgO6
kTUAn1v+AHEW4aZxfNMpQGNMfQM3UqSD
=NQF6
-----END PGP SIGNATURE-----


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]