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

Re: [PATCH] Add askmethod to all bootloaders we use



These all look correct to me.

On 06/19/2009 10:31 AM, Martin Sivak wrote:
> 
> diff -uNr anaconda-11.5.0.59/bootdisk/i386/grub.conf anaconda-11.5.0.59.new/bootdisk/i386/grub.conf
> --- anaconda-11.5.0.59/bootdisk/i386/grub.conf	2009-06-02 21:11:19.000000000 +0200
> +++ anaconda-11.5.0.59.new/bootdisk/i386/grub.conf	2009-06-19 16:22:12.000000000 +0200
> @@ -4,5 +4,5 @@
>  timeout 5
>  hiddenmenu
>  title @PRODUCT@ @VERSION@
> -	kernel @KERNELPATH@
> +	kernel @KERNELPATH@ askmethod
>  	initrd @INITRDPATH@
> diff -uNr anaconda-11.5.0.59/bootdisk/i386/syslinux.cfg anaconda-11.5.0.59.new/bootdisk/i386/syslinux.cfg
> --- anaconda-11.5.0.59/bootdisk/i386/syslinux.cfg	2009-06-02 21:11:19.000000000 +0200
> +++ anaconda-11.5.0.59.new/bootdisk/i386/syslinux.cfg	2009-06-19 16:20:27.000000000 +0200
> @@ -19,15 +19,15 @@
>    menu label ^Install or upgrade an existing system
>    menu default
>    kernel vmlinuz
> -  append initrd=initrd.img
> +  append initrd=initrd.img askmethod
>  label vesa
>    menu label Install system with ^basic video driver
>    kernel vmlinuz
> -  append initrd=initrd.img xdriver=vesa nomodeset
> +  append initrd=initrd.img xdriver=vesa nomodeset askmethod
>  label rescue
>    menu label ^Rescue installed system
>    kernel vmlinuz
> -  append initrd=initrd.img rescue
> +  append initrd=initrd.img rescue askmethod
>  label local
>    menu label Boot from ^local drive
>    localboot 0xffff
> diff -uNr anaconda-11.5.0.59/bootdisk/ppc/yaboot.conf.3264 anaconda-11.5.0.59.new/bootdisk/ppc/yaboot.conf.3264
> --- anaconda-11.5.0.59/bootdisk/ppc/yaboot.conf.3264	2009-06-02 21:11:19.000000000 +0200
> +++ anaconda-11.5.0.59.new/bootdisk/ppc/yaboot.conf.3264	2009-06-19 16:23:53.000000000 +0200
> @@ -6,9 +6,11 @@
>  	label=linux64
>  	alias=linux
>  	initrd=/ppc/ppc64/ramdisk.image.gz
> +	append="askmethod"
>  	read-only
>  
>  image=/ppc/ppc32/vmlinuz
>  	label=linux32
>  	initrd=/ppc/ppc32/ramdisk.image.gz
> +	append="askmethod"
>  	read-only
> diff -uNr anaconda-11.5.0.59/bootdisk/ppc/yaboot.conf.in anaconda-11.5.0.59.new/bootdisk/ppc/yaboot.conf.in
> --- anaconda-11.5.0.59/bootdisk/ppc/yaboot.conf.in	2009-06-02 21:11:19.000000000 +0200
> +++ anaconda-11.5.0.59.new/bootdisk/ppc/yaboot.conf.in	2009-06-19 16:23:38.000000000 +0200
> @@ -5,4 +5,5 @@
>  image=/ppc/ppc%BITS%/vmlinuz
>  	label=linux
>  	initrd=/ppc/ppc%BITS%/ramdisk.image.gz
> +	append="askmethod"
>  	read-only
> diff -uNr anaconda-11.5.0.59/bootdisk/s390x/generic.prm anaconda-11.5.0.59.new/bootdisk/s390x/generic.prm
> --- anaconda-11.5.0.59/bootdisk/s390x/generic.prm	2009-06-02 21:11:19.000000000 +0200
> +++ anaconda-11.5.0.59.new/bootdisk/s390x/generic.prm	2009-06-19 16:21:33.000000000 +0200
> @@ -1 +1 @@
> -root=/dev/ram0 ro ip=off ramdisk_size=40000
> +root=/dev/ram0 ro ip=off ramdisk_size=40000 askmethod
> diff -uNr anaconda-11.5.0.59/bootdisk/x86_64/grub.conf anaconda-11.5.0.59.new/bootdisk/x86_64/grub.conf
> --- anaconda-11.5.0.59/bootdisk/x86_64/grub.conf	2009-06-02 21:11:19.000000000 +0200
> +++ anaconda-11.5.0.59.new/bootdisk/x86_64/grub.conf	2009-06-19 16:22:01.000000000 +0200
> @@ -4,5 +4,5 @@
>  timeout 5
>  hiddenmenu
>  title @PRODUCT@ @VERSION@
> -	kernel @KERNELPATH@
> +	kernel @KERNELPATH@ askmethod
>  	initrd @INITRDPATH@
> diff -uNr anaconda-11.5.0.59/bootdisk/x86_64/syslinux.cfg anaconda-11.5.0.59.new/bootdisk/x86_64/syslinux.cfg
> --- anaconda-11.5.0.59/bootdisk/x86_64/syslinux.cfg	2009-06-02 21:11:19.000000000 +0200
> +++ anaconda-11.5.0.59.new/bootdisk/x86_64/syslinux.cfg	2009-06-19 16:21:51.000000000 +0200
> @@ -19,15 +19,15 @@
>    menu label ^Install or upgrade an existing system
>    menu default
>    kernel vmlinuz
> -  append initrd=initrd.img
> +  append initrd=initrd.img askmethod
>  label vesa
>    menu label Install system with ^basic video driver
>    kernel vmlinuz
> -  append initrd=initrd.img xdriver=vesa nomodeset
> +  append initrd=initrd.img xdriver=vesa nomodeset askmethod
>  label rescue
>    menu label ^Rescue installed system
>    kernel vmlinuz
> -  append initrd=initrd.img rescue
> +  append initrd=initrd.img rescue askmethod
>  label local
>    menu label Boot from ^local drive
>    localboot 0xffff


-- 
        Peter

In computing, turning the obvious into the useful is a living
definition of the word "frustration"
		-- Alan Perlis


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