svn commit: r228985 - head/sys/boot/forth

[Dimitry Andric]

On 2012-01-08 21:35, Sergey Kandaurov wrote:
...
> So, the problem arise when beastie_disable is set.
>
> In this case menu.rc is not evaluated and consequently menu-unset does
> not have a body yet. This results in the ficl warning "not found" when
> try-menu-unset calls menu-unset. The warning cannot be handled with catch
> as seen with the code in head.
> Otherwise, when beastie is enabled, all works as it should.
>
> To "fix" the problem I replaced 'catch' with 'sfind', so that we can
> conditionally call menu-unset only when the definition is present.
>
> Please try the following patch. I tested it with enabled/disabled beastie
> and loader_color over serial console. I would also like to get a review
> from Devin Teske to see if this change is acceptable.

Yes, this patch makes the warning disappear.  Thanks!