diff mbox

[3/9] boot/syslinux: remove 'default y' in sub-options

Message ID d3ab10dd08d3a1f70c0f7c79a5104d17a503579f.1398378217.git.yann.morin.1998@free.fr
State Changes Requested
Headers show

Commit Message

Yann E. MORIN April 24, 2014, 10:29 p.m. UTC
From: "Yann E. MORIN" <yann.morin.1998@free.fr>

Remove the 'default y' from sub-options, but ensure at least one
is enabled anyway.

We keep the 'default y' to the default option, so that the menuconfig
behaviour is not too surprising.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Lundquist <thomasez@redpill-linpro.com>
Cc: Frank Hunleth <fhunleth@troodon-software.com>
---
 boot/syslinux/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Arnout Vandecappelle April 24, 2014, 10:55 p.m. UTC | #1
On 25/04/14 00:29, Yann E. MORIN wrote:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> Remove the 'default y' from sub-options, but ensure at least one
> is enabled anyway.
> 
> We keep the 'default y' to the default option, so that the menuconfig
> behaviour is not too surprising.

 The "surprising" part is that isolinux will be unselected when one of
the other options is selected. If you really want both isolinux and
pxelinux, that indeed is surprising. But I think you usually want either,
not both. So in that case the fact that you first have to select pxelinux
and then unselect isolinux doesn't seem appropriate to me.

 Otherwise, looks good to me.

 Regards,
 Arnout

> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas Lundquist <thomasez@redpill-linpro.com>
> Cc: Frank Hunleth <fhunleth@troodon-software.com>
> ---
>  boot/syslinux/Config.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
> index 5b1122d..1b8c527 100644
> --- a/boot/syslinux/Config.in
> +++ b/boot/syslinux/Config.in
> @@ -2,6 +2,7 @@ config BR2_TARGET_SYSLINUX
>  	bool "syslinux"
>  	depends on BR2_i386 || BR2_x86_64
>  	select BR2_HOSTARCH_NEEDS_IA32_COMPILER
> +	select BR2_TARGET_SYSLINUX_ISOLINUX if !BR2_TARGET_SYSLINUX_PXELINUX
>  	help
>  	  The syslinux bootloader for x86 systems.
>  	  This includes: syslinux, pxelinux, extlinux.
> @@ -16,6 +17,5 @@ config BR2_TARGET_SYSLINUX_ISOLINUX
>  
>  config BR2_TARGET_SYSLINUX_PXELINUX
>  	bool "Install pxelinux"
> -	default y
>  
>  endif
>
Yann E. MORIN April 25, 2014, 2:54 p.m. UTC | #2
Arnout, All,

On 2014-04-25 00:55 +0200, Arnout Vandecappelle spake thusly:
> On 25/04/14 00:29, Yann E. MORIN wrote:
> > From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > 
> > Remove the 'default y' from sub-options, but ensure at least one
> > is enabled anyway.
> > 
> > We keep the 'default y' to the default option, so that the menuconfig
> > behaviour is not too surprising.
> 
>  The "surprising" part is that isolinux will be unselected when one of
> the other options is selected. If you really want both isolinux and
> pxelinux, that indeed is surprising. But I think you usually want either,
> not both. So in that case the fact that you first have to select pxelinux
> and then unselect isolinux doesn't seem appropriate to me.

Yes, I was wondering what the expected behaviour would have been. I
would expect that something that is forcibly ON by default stays ON,
unless I explicitly disable it.

But the expected usage of syslinux is indeed that either is usually
used, not both (or more, given the following addition of the MBR, too).

So, I don't really care either way. Let's see what others think, I'll
rework the series if needed.

Regards,
Yann E. MORIN.
diff mbox

Patch

diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
index 5b1122d..1b8c527 100644
--- a/boot/syslinux/Config.in
+++ b/boot/syslinux/Config.in
@@ -2,6 +2,7 @@  config BR2_TARGET_SYSLINUX
 	bool "syslinux"
 	depends on BR2_i386 || BR2_x86_64
 	select BR2_HOSTARCH_NEEDS_IA32_COMPILER
+	select BR2_TARGET_SYSLINUX_ISOLINUX if !BR2_TARGET_SYSLINUX_PXELINUX
 	help
 	  The syslinux bootloader for x86 systems.
 	  This includes: syslinux, pxelinux, extlinux.
@@ -16,6 +17,5 @@  config BR2_TARGET_SYSLINUX_ISOLINUX
 
 config BR2_TARGET_SYSLINUX_PXELINUX
 	bool "Install pxelinux"
-	default y
 
 endif