petitboot
5 years agotest/parser: Add dependency on libpbcore.la
Jeremy Kerr [Fri, 28 Nov 2014 03:44:03 +0000 (11:44 +0800)]
test/parser: Add dependency on libpbcore.la

Currently, build only a test object will fail:

  [jk@pablo obj]$ make ./test/parser/test-grub2-single

    CCLD     test/parser/test-grub2-single
  libtool: link: cannot find the library `lib/libpbcore.la' or unhandled argument `lib/libpbcore.la'

We're adding this to the link argument, but not as a dependency. This
change adds the dependency.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agolib/fold: fix warning with -DDEBUG
Jeremy Kerr [Fri, 28 Nov 2014 03:42:06 +0000 (11:42 +0800)]
lib/fold: fix warning with -DDEBUG

When compiling the fold code with DEBUG defined, we get:

../lib/fold/fold.c: In function 'fold_text':
../lib/fold/fold.c:37:3: error: comparison of unsigned expression >= 0 is always true [-Werror=type-limits]
   assert(bytes >= 0);
   ^

We should be comparing with != (size_t)-1, not >= 0

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/grub2: fix incorrect prototype in yyerror
Jeremy Kerr [Fri, 28 Nov 2014 03:40:05 +0000 (11:40 +0800)]
discover/grub2: fix incorrect prototype in yyerror

Because we're using two parse-params, we need to add the scanner
argument to yyerror.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Properly size buttons in boot option editor
Samuel Mendoza-Jonas [Sun, 12 Oct 2014 22:45:04 +0000 (09:45 +1100)]
ui/ncurses: Properly size buttons in boot option editor

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
5 years agopo: Translation Updates
Samuel Mendoza-Jonas [Mon, 13 Oct 2014 00:04:58 +0000 (11:04 +1100)]
po: Translation Updates

Including "Network Interfaces", "up" and "down", and other minor updates

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
5 years agoui/ncurses: Expand width of pad
Samuel Mendoza-Jonas [Wed, 8 Oct 2014 03:03:49 +0000 (14:03 +1100)]
ui/ncurses: Expand width of pad

Widgets running over the horizontal width of the pad will cause the
screen to blank. Expand the (non-viewable) size of the pad to prevent
blanking until shorter translations are available for nc-config.

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
5 years agoui/ncurses: Warn if widget runs over horizontal pad width
Samuel Mendoza-Jonas [Fri, 3 Oct 2014 04:37:20 +0000 (14:37 +1000)]
ui/ncurses: Warn if widget runs over horizontal pad width

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
5 years agoui/ncurses: Properly size cancel and help buttons
Samuel Mendoza-Jonas [Wed, 8 Oct 2014 02:49:30 +0000 (13:49 +1100)]
ui/ncurses: Properly size cancel and help buttons

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
5 years agoui/ncurses: Dynamically align text fields in nc-config
Samuel Mendoza-Jonas [Wed, 8 Oct 2014 02:40:47 +0000 (13:40 +1100)]
ui/ncurses: Dynamically align text fields in nc-config

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
5 years agopo: Minor Russian translation updates
Samuel Mendoza-Jonas [Wed, 8 Oct 2014 00:56:06 +0000 (11:56 +1100)]
po: Minor Russian translation updates

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
5 years agodiscover/platform: Add finalise_config_hook
Jeremy Kerr [Mon, 29 Sep 2014 23:23:22 +0000 (09:23 +1000)]
discover/platform: Add finalise_config_hook

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
5 years agopo: French translation updates
Samuel Mendoza-Jonas [Tue, 30 Sep 2014 00:20:40 +0000 (10:20 +1000)]
po: French translation updates

Shorten strings in labels and help text for nc-config.

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
5 years agoui/ncurses: Adjust position of add-url field to fit translated label
Samuel Mendoza-Jonas [Mon, 22 Sep 2014 06:05:07 +0000 (16:05 +1000)]
ui/ncurses: Adjust position of add-url field to fit translated label

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
5 years agoui/ncurses: Expand cancel & help button width
Samuel Mendoza-Jonas [Tue, 23 Sep 2014 07:32:35 +0000 (17:32 +1000)]
ui/ncurses: Expand cancel & help button width

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
5 years agopo: translation updates
Samuel Mendoza-Jonas [Tue, 23 Sep 2014 07:25:33 +0000 (17:25 +1000)]
po: translation updates

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
5 years agotests/lib/test-fold: Add mbs test with separators
Jeremy Kerr [Tue, 23 Sep 2014 07:07:14 +0000 (15:07 +0800)]
tests/lib/test-fold: Add mbs test with separators

Ensure we're doing the correct thing with mbs + separators in the fold
code.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agolib/fold: Add support for multibyte strings
Jeremy Kerr [Tue, 23 Sep 2014 06:46:06 +0000 (14:46 +0800)]
lib/fold: Add support for multibyte strings

Currently, the fold_text function doesn't understand multibyte strings,
so may break a line in the middle of a multibyte sequence.

This change adds multibyte-awareness to the fold code, and uses proper
width calculations for the contents of the folded string.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Fix unstranslated strings in sysinfo screen
Jeremy Kerr [Fri, 19 Sep 2014 01:07:36 +0000 (09:07 +0800)]
ui/ncurses: Fix unstranslated strings in sysinfo screen

We have a couple of strings that are missing the gettext call.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/platform-powerpc: Read language configuration from NVRAM
Jeremy Kerr [Thu, 18 Sep 2014 14:13:27 +0000 (22:13 +0800)]
discover/platform-powerpc: Read language configuration from NVRAM

Implement load & save of the petitboot language configuration.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Fix clearing a boot device UUID
Jeremy Kerr [Thu, 18 Sep 2014 11:21:00 +0000 (19:21 +0800)]
ui/ncurses: Fix clearing a boot device UUID

Currently, we have a bug where we can't clear a boot device UUID, as we
only update config->boot_device if we're in AUTOBOOT_ONE state. This
means that the config UI can't be used to change out of "autoboot from a
single device" mode.

This sets the autoboot device unconditionally, allowing it to be
cleared.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/platform: Add boot device to config dump
Jeremy Kerr [Thu, 18 Sep 2014 11:18:32 +0000 (19:18 +0800)]
discover/platform: Add boot device to config dump

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agopo: Add initial translations
Jeremy Kerr [Fri, 29 Aug 2014 08:33:51 +0000 (16:33 +0800)]
po: Add initial translations

Add the initial translation set for de, en, es, fr, it, ja, ko, pt_BR,
ru, zh_CN and zh_TW languages.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Correctly size pad for config screen
Samuel Mendoza-Jonas [Wed, 10 Sep 2014 00:50:44 +0000 (10:50 +1000)]
ui/ncurses: Correctly size pad for config screen

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Help string fixes
Jeremy Kerr [Mon, 1 Sep 2014 05:40:01 +0000 (13:40 +0800)]
ui/ncurses: Help string fixes

The Configuration screen help doesn't reflect the option name, so
update that to match. Also, fix the wording of the "Rescan devices"
help.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Exit safe mode on configuration change
Samuel Mendoza-Jonas [Fri, 29 Aug 2014 04:03:17 +0000 (14:03 +1000)]
ui/ncurses: Exit safe mode on configuration change

Selecting 'OK' in the configuration or language select screen will send
a configuration change to the server and exit safe mode.
Exit safe mode explicity and warn the user that they are about to exit
it.

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Reject ADD_URL actions without configured network
Samuel Mendoza-Jonas [Fri, 29 Aug 2014 04:03:16 +0000 (14:03 +1000)]
discover: Reject ADD_URL actions without configured network

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Implement PXE SYSAPPEND syntax
Jeremy Kerr [Mon, 25 Aug 2014 07:49:29 +0000 (15:49 +0800)]
discover: Implement PXE SYSAPPEND syntax

This change implements SYSAPPEND/IPAPPEND 2, to add a BOOTIF argument to
the kernel command line.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Update 'add-url' help message
Samuel Mendoza-Jonas [Fri, 22 Aug 2014 01:24:43 +0000 (11:24 +1000)]
ui/ncurses: Update 'add-url' help message

We should make it clear that we're looking for a PXE-style config file.

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Add new main menu options to help screen
Jeremy Kerr [Thu, 21 Aug 2014 04:17:24 +0000 (12:17 +0800)]
ui/ncurses: Add new main menu options to help screen

The language, rescan and retrieve options are new, so add them to the
help text.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Make device labels translateable
Jeremy Kerr [Thu, 21 Aug 2014 02:19:09 +0000 (10:19 +0800)]
ui/ncurses: Make device labels translateable

We're not using gettext for the device label strings; this change adds
the necessary macros to do so.

Also, we change "Interface" to "Network", to make the label a little
more obvious.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/platform-powerpc: Fix incorrect device tree directory
Jeremy Kerr [Thu, 7 Aug 2014 11:16:21 +0000 (21:16 +1000)]
discover/platform-powerpc: Fix incorrect device tree directory

It's /proc/device-tree, not /proc/device_tree. Use a variable to hold
this prefix.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoversion.sh: Don't use dashes in version numbers
Jeremy Kerr [Tue, 5 Aug 2014 06:01:34 +0000 (14:01 +0800)]
version.sh: Don't use dashes in version numbers

... as they're not valid for RPM.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Add debug flag to config
Jeremy Kerr [Wed, 23 Jul 2014 06:20:12 +0000 (14:20 +0800)]
discover: Add debug flag to config

This change adds a debug flag to the config, and groups it under
not-user-modifiable parts of struct config.

This means we no longer need the pb-sysinfo helper, as the last
remaining function (--debug-enabled) can be implemented with pb-config.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Use platform code to read sysinfo type and identifier
Jeremy Kerr [Wed, 23 Jul 2014 06:03:42 +0000 (14:03 +0800)]
discover: Use platform code to read sysinfo type and identifier

This change uses the platform-specific code to read the system type and
identifier, rather than the pb-sysinfo utility. We introduce a new
callback for struct platform:

  int (*get_sysinfo)(struct platform *, struct system_info *);

- which populates struct system_info with appropriate information.

This means that the system-specific code is kept in one place; rather
than having powerpc-specific device-tree-reading code in the pb-sysinfo
shell script.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agolib: Move generic file-handling code to lib/
Jeremy Kerr [Wed, 23 Jul 2014 05:47:32 +0000 (13:47 +0800)]
lib: Move generic file-handling code to lib/

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoutils: Add pb-config utility
Jeremy Kerr [Wed, 23 Jul 2014 05:33:15 +0000 (13:33 +0800)]
utils: Add pb-config utility

A simple tool to query platform configuration.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Move platform config to a .ro
Jeremy Kerr [Wed, 23 Jul 2014 05:32:08 +0000 (13:32 +0800)]
discover: Move platform config to a .ro

We want to allow an external utility to use the platform config code, so
build it into a .ro, which is then linked to the discover code.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/grub2: distinguish parser.h from grub2/parser.h
Jeremy Kerr [Mon, 4 Aug 2014 01:46:00 +0000 (09:46 +0800)]
discover/grub2: distinguish parser.h from grub2/parser.h

'make distcheck' will do a 'make all' srcdir == objdir, then later a
'make check' sith srcdir != objdir. Since gcc's cpp always assumes that
a source file's directory is first in the include paths, we may see
discover/parser.h included when we wanted the generated
discover/grub2/parser.h.

This change renames the grub2 lexer and parser files, to work-around
this behaviour, and fix 'make distcheck'.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoautomake: silence make output
Jeremy Kerr [Fri, 1 Aug 2014 04:32:31 +0000 (12:32 +0800)]
automake: silence make output

Currently, we get a lot of noise out of the build process; automake
supports V={0,1}, which we can use to suppress the output a little.

This needs a few cleanups for custom commands.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoautotools: Don't link udev into everything
Jeremy Kerr [Fri, 1 Aug 2014 03:55:45 +0000 (11:55 +0800)]
autotools: Don't link udev into everything

By default, AC_CHECK_LIB will append to $LIBS, which is used for all
link stages. Intstead, we should popuate $UDEV_LIBS, and just use that
for the single pb-discover link stage.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoautotools: Use non-recursive make
Jeremy Kerr [Mon, 28 Jul 2014 08:20:04 +0000 (16:20 +0800)]
autotools: Use non-recursive make

With the current testing infrastructure, we don't have a strictly
hierarchical set of dependencies. This causes problems with a recursive
make, and means we have to hack around some of the dependencies.

This change generates a single, top-level makefile from all of the
Makefile.am fragments. We still need the po/ directory as a separate
SUBDIR, but all others can be converted to non-recursive.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoconfigure: don't put cpp flags in CFLAGS
Jeremy Kerr [Fri, 1 Aug 2014 01:30:52 +0000 (09:30 +0800)]
configure: don't put cpp flags in CFLAGS

-D* should go in CPPFLAGS, not CFLAGS.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: add initialiser for config->safe_mode
Jeremy Kerr [Fri, 1 Aug 2014 03:08:40 +0000 (11:08 +0800)]
discover: add initialiser for config->safe_mode

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agotest/parser: Add missing stubs for network_(un)register_interface
Jeremy Kerr [Fri, 1 Aug 2014 01:28:51 +0000 (09:28 +0800)]
test/parser: Add missing stubs for network_(un)register_interface

The device handler code needs these calls on interface add/remove, so we
need to provide stubs for the test framework.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Add missing include
Jeremy Kerr [Fri, 1 Aug 2014 01:27:29 +0000 (09:27 +0800)]
discover: Add missing include

We use setlocale() in device-handler.c, so we need locale.h

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Add support for 'add-url' action
Samuel Mendoza-Jonas [Thu, 24 Jul 2014 05:05:39 +0000 (15:05 +1000)]
ui/ncurses: Add support for 'add-url' action

Creates a menu option to specify a remote conf file url to send to
the server for parsing.

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Add support for 'add-url' actions
Samuel Mendoza-Jonas [Thu, 24 Jul 2014 05:05:38 +0000 (15:05 +1000)]
discover: Add support for 'add-url' actions

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agolib/pb-protocol: Define new 'add-url' action
Samuel Mendoza-Jonas [Thu, 24 Jul 2014 05:05:37 +0000 (15:05 +1000)]
lib/pb-protocol: Define new 'add-url' action

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Enable 'url' pb-events
Samuel Mendoza-Jonas [Thu, 24 Jul 2014 05:05:36 +0000 (15:05 +1000)]
discover: Enable 'url' pb-events

Adds a new option to pb-event;
./pb-event url@dev url=scheme://path/to/petitboot.conf

Specifies a remote conf file to parse for boot options

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Use translated strings for boot status messages
Jeremy Kerr [Mon, 28 Jul 2014 04:18:21 +0000 (12:18 +0800)]
discover: Use translated strings for boot status messages

Since we're operating in the correct locale now, we can send translated
strings in the boot status messages.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Add setlocale calls in discover server
Jeremy Kerr [Mon, 28 Jul 2014 04:09:14 +0000 (12:09 +0800)]
discover: Add setlocale calls in discover server

We want the discover server to respect the configured language, so we'll
need to add appropriate setlocale() calls. We use the config->lang
setting to use any previously-saved language.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Add language selector & support for language changes
Jeremy Kerr [Mon, 28 Jul 2014 02:42:25 +0000 (10:42 +0800)]
ui/ncurses: Add language selector & support for language changes

This change adds a language selector UI, and allows language changes
from incoming configuration messages.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoconfig: Add lang member to config
Jeremy Kerr [Fri, 25 Jul 2014 01:49:37 +0000 (09:49 +0800)]
config: Add lang member to config

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/common: Add discover_client_enumerate to re-add device data
Jeremy Kerr [Thu, 24 Jul 2014 08:00:59 +0000 (16:00 +0800)]
ui/common: Add discover_client_enumerate to re-add device data

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Move menu initialisation to cui code
Jeremy Kerr [Thu, 24 Jul 2014 07:13:24 +0000 (15:13 +0800)]
ui/ncurses: Move menu initialisation to cui code

We'll want to re-initialise the petitboot main menu (when the language
is changed), which we can't do if the items are populated entirely from
the main() function.

This change moves the menu initilisation to the cui code, we we can
re-init when necessary.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoi18n: Add english translation
Jeremy Kerr [Tue, 24 Jun 2014 06:00:12 +0000 (14:00 +0800)]
i18n: Add english translation

No translation necessary.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Mark help text as translateable
Jeremy Kerr [Tue, 24 Jun 2014 05:32:45 +0000 (13:32 +0800)]
ui/ncurses: Mark help text as translateable

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Use a separate type for help text
Jeremy Kerr [Tue, 24 Jun 2014 05:18:03 +0000 (13:18 +0800)]
ui/ncurses: Use a separate type for help text

Because it's initialised statically, help text won't be directly
gettext()-ed. Instead, we need to perform the gettext translation at
runtime, and pass untranslated strings into the help_screen code.

Instead of trusting callers to pass the untranslated strings though, we
encapsulate the help text data into struct help_text, so we know we have
an unstranslated string.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoi18n: Mark translatable strings for ncurses UI
Jeremy Kerr [Wed, 18 Dec 2013 01:49:23 +0000 (09:49 +0800)]
i18n: Mark translatable strings for ncurses UI

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoAdd gettext infrastructure
Jeremy Kerr [Mon, 16 Dec 2013 07:27:14 +0000 (15:27 +0800)]
Add gettext infrastructure

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Only update our config if the config_set succeeded.
Jeremy Kerr [Mon, 28 Jul 2014 02:09:49 +0000 (10:09 +0800)]
discover: Only update our config if the config_set succeeded.

If config_set fails, we don't want to send the failed config out to
clients.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Add device hierarchy
Samuel Mendoza-Jonas [Wed, 16 Jul 2014 06:23:59 +0000 (16:23 +1000)]
ui/ncurses: Add device hierarchy

Boot options are now listed under their matching boot device in the
ncurses UI to help differentitate similar boot option names

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Add safe mode indicator
Jeremy Kerr [Mon, 21 Jul 2014 10:28:04 +0000 (18:28 +0800)]
ui/ncurses: Add safe mode indicator

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/platform-powerpc: Configure safe mode from IPMI bootdev setting
Jeremy Kerr [Mon, 21 Jul 2014 10:30:33 +0000 (18:30 +0800)]
discover/platform-powerpc: Configure safe mode from IPMI bootdev setting

An IPMI bootflags of 0x3 indicates a safe-mode boot. Use this to trigger
petitboot's safe mode.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Add safe mode
Jeremy Kerr [Mon, 21 Jul 2014 10:18:35 +0000 (18:18 +0800)]
discover: Add safe mode

Safe mode configures the discover server to not start any device
parsing; this can be used to diagnose any problems with early device
handing.

In safe mode, we don't initialise any of the device sources - udev,
network and user events are disabled.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoversion.sh: Ensure we're using petitboot's git directory
Jeremy Kerr [Fri, 18 Jul 2014 05:23:42 +0000 (13:23 +0800)]
version.sh: Ensure we're using petitboot's git directory

We don't want the version to be extracted from a higher-level git
directory.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: allow tab/backtab to skip through a widget's fields
Jeremy Kerr [Fri, 18 Jul 2014 04:28:43 +0000 (12:28 +0800)]
ui/ncurses: allow tab/backtab to skip through a widget's fields

Since we may have a long list of devices on the configuration screen,
we'd like a way to jump between widgets. This change repeats the
PREV_FIELD/NEXT_FIELD driver request on these events.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Make Network: heading consistent with other labels
Jeremy Kerr [Fri, 18 Jul 2014 02:49:32 +0000 (10:49 +0800)]
ui/ncurses: Make Network: heading consistent with other labels

The 'Network' label was originally intended as a header, but we should
keep it consistent with other field labels.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Expose boot_device configuration through UI
Jeremy Kerr [Wed, 30 Apr 2014 04:14:41 +0000 (12:14 +0800)]
ui/ncurses: Expose boot_device configuration through UI

Add a configuration setting for the default boot device.

We change the autoboot option to a select, as we have three possible
behaviours for autoboot:

 ( ) Don't autoboot
 ( ) Autoboot from any disk/network device
 ( ) Only autoboot from a specific disk/network device

The latter option will show a list of possible devices to seelct for
autoboot behaviour.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/powerpc: Parse & save default boot device parameter
Jeremy Kerr [Wed, 30 Apr 2014 03:25:42 +0000 (11:25 +0800)]
discover/powerpc: Parse & save default boot device parameter

This change implement load & save support for the default boot device
configuration parameter.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: check config.boot_device before setting a default
Jeremy Kerr [Wed, 30 Apr 2014 02:58:43 +0000 (10:58 +0800)]
discover: check config.boot_device before setting a default

If a default device is set, we only allow booting from that device.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoconfig: Add boot_device member to config
Jeremy Kerr [Wed, 30 Apr 2014 02:17:20 +0000 (10:17 +0800)]
config: Add boot_device member to config

We'd like to specify a way to only boot from a specific block device;
this adds a field to the configuration to hold the value.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: allow separate lifetimes for network interfaces and discover devices
Jeremy Kerr [Mon, 21 Jul 2014 07:51:58 +0000 (15:51 +0800)]
discover: allow separate lifetimes for network interfaces and discover devices

We want the network code's network interfaces to (potentially) persist
remove events. For example, discover devices may be removed by a user
event (this happens during a udhcpc deconfig). In this case, we want the
boot options to be removed, but the struct interface needs to stay
present.

This change adds network_(un)_register_device functions, to allow the
device handler to detach from and attach to interfaces.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Set UUID for network interface devices
Jeremy Kerr [Thu, 17 Jul 2014 01:13:58 +0000 (09:13 +0800)]
discover: Set UUID for network interface devices

We want to lookup network (as well as block) devices by UUID, so set one
based on the MAC address.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Remove net_conf parameter from sconfig_screen_layout_widgets
Jeremy Kerr [Thu, 17 Jul 2014 03:08:09 +0000 (11:08 +0800)]
ui/ncurses: Remove net_conf parameter from sconfig_screen_layout_widgets

We always pass screen->net_conf_type as this parameter, so we may as
weel grab it from screen directly.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: specify a fixed length for status messages
Jeremy Kerr [Mon, 5 May 2014 03:45:16 +0000 (11:45 +0800)]
ui/ncurses: specify a fixed length for status messages

Incoming status messages can be an arbitrary length; if so, the status
line may be corrupt.

This change uses the 'n' variant of mvwaddnstr(), so we only write one
line of characters.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: place countdown earlier in boot status messages
Jeremy Kerr [Mon, 5 May 2014 03:43:13 +0000 (11:43 +0800)]
discover: place countdown earlier in boot status messages

The boot status messages may be trimmed on the right-hand side; In this
case, we'll lose the boot countdown.

This change moves the boot countdown time to before the arbitrary-length
label string.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/pxe-parser: Remove unnecessary semicolon
Jeremy Kerr [Wed, 4 Jun 2014 04:35:25 +0000 (12:35 +0800)]
discover/pxe-parser: Remove unnecessary semicolon

We have an unnecessary semicolon on an empty for-loop, which causes a
clang warning.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agom4: Add ncurses autoconf macros
Jeremy Kerr [Fri, 13 Jun 2014 03:42:03 +0000 (13:42 +1000)]
m4: Add ncurses autoconf macros

Currently, we depend on host autoconf-archive for the AX_WITH_CURSES
macros. Insead, include this in the source tree under m4/

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoversion.sh: Use git tags in versions
Jeremy Kerr [Fri, 14 Mar 2014 03:06:10 +0000 (11:06 +0800)]
version.sh: Use git tags in versions

If the current HEAD is tagged, we'd like to use that tag as the version.

We remove a 'v' prefix, so that v1.0 -> 1.0

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoversion.sh: Unify version generation
Jeremy Kerr [Fri, 14 Mar 2014 02:53:04 +0000 (10:53 +0800)]
version.sh: Unify version generation

This change includes a few fixes to the version.sh script, in order to
unify the versions generated from git vs. dev- versions. We unify on a
simple YYYYMMDD format, and drop the time specifier (if you're relying
on time info, you probably have the git SHAs to lookup from instead).

We also clean up the date-generation code, by using printf's %T
formatter, on git's %ct time specification, rather than trying to
transform a %ci date.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoautotools: Make petitboot autoreconfable
Jeff Bailey [Fri, 14 Mar 2014 00:49:10 +0000 (08:49 +0800)]
autotools: Make petitboot autoreconfable

The standard way to regenerate the autotools bits is with 'autoreconf',
but that doesn't work with our custom bootstrap script. We only need the
bootstrap script to generate the version in configure.ac, which we can
easily do with m4_esyscmd_s instead.

This change allows autoreconfiguration with `autoreconf -f -i`.

Includes changes proposed by Yann E. Morin <yann.morin.1998@free.fr>,
and modifications from the original patch from
Jeremy Kerr <jk@ozlabs.org>

Signed-off-by: Jeff Bailey <jeffbailey@google.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoautotools: Don't require custom automake options
Jeff Bailey [Fri, 14 Mar 2014 01:04:00 +0000 (09:04 +0800)]
autotools: Don't require custom automake options

We need a couple of automake options to prevent errors when regenerating
Makefile.ins during source preparation.

Some makefiles assume GNU make, so add 'foreign' where necessary. Also,
we are building objects in subdirectories, so we need 'subdir-objects'.

Modified to suit recent petitboot by Jeremy Kerr <jk@ozlabs.org>

Signed-off-by: Jeff Bailey <jeffbailey@google.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/network: leave udhcpc processes running
Jeremy Kerr [Thu, 5 Jun 2014 07:38:07 +0000 (15:38 +0800)]
discover/network: leave udhcpc processes running

Currently, we start udhcpc with the '-n' argument, which means they'll
exit if no lease is obtained.

We'd prefer to leave the DHCP client running, so that any
slow-to-initialise links are not left deconfigured.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/platform-powerpc: Don't rely on NVRAM working
Jeremy Kerr [Thu, 22 May 2014 10:31:16 +0000 (18:31 +0800)]
discover/platform-powerpc: Don't rely on NVRAM working

Although we need nvram to save settings, we may be running on a
nvram-less machine, but still need to detect as powerpc.

This change removes the nvram check.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/network: Fix incorrect udhcpc command if we have no platform definition
Jeremy Kerr [Thu, 22 May 2014 08:03:19 +0000 (16:03 +0800)]
discover/network: Fix incorrect udhcpc command if we have no platform definition

If we don't have a platform defined, we generate an invalid uchdpc
command, as we've NULL-ed out the interface name.

This change fixes the no-platform case to terminate *after* the
interface name.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agogrub2: fix empty file handling
Jeremy Kerr [Wed, 4 Jun 2014 07:45:53 +0000 (15:45 +0800)]
grub2: fix empty file handling

Currently, we have a bug when parsing zero-length files: we subtract one
from the length to exclude the trailing NUL (added by read_file), but a
zero-length file will result in a length of -1.

This change adds an explicit exit if we're attempting to parse an empty
file.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/paths: Fix wget command with https and !DEBUG
Jeremy Kerr [Wed, 4 Jun 2014 07:22:11 +0000 (15:22 +0800)]
discover/paths: Fix wget command with https and !DEBUG

When DEBUG is undefed, we run out of wget arguments for loading https
URLs. We need an extra element in the argv array to handle all possible
arguments.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: don't free cancelled load tasks
Jeremy Kerr [Thu, 22 May 2014 10:42:33 +0000 (18:42 +0800)]
discover: don't free cancelled load tasks

Currently, we have a bug when a boot task with more than one load tasks
is cancelled:

1) boot_cancel calls cleanup_cancellations, which performs a
load_url_async_cancel on all load tasks. This sets the load tasks'
states to LOAD_CANCELLED, and signals associated processes.

2) The first load task process completes, we get a load_url_process_exit
callback. This then invokes cleanup_cancellations.

3) cleanup_cancellations then (incorrectly) frees the boot task (and
hence freeing all pending load tasks) as no load tasks are in LOAD_ASYNC
state (we set them all to LOAD_CANCELLED in step 1)

4) The actual completion for the second load task attempts to reference
the now-freed task structure.

This change fixes the issue by handing the LOAD_CANCELLED state properly
- if we find a load task in this state, we consider the boot task still
pending, and delay the free until all loads are complete.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoutils/pb-console: use a linux termcap entry for local consoles
Jeremy Kerr [Mon, 19 May 2014 05:16:51 +0000 (13:16 +0800)]
utils/pb-console: use a linux termcap entry for local consoles

For local consoles, we always want a TERM=linux.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover,ui: fix checks for debug option
Jeremy Kerr [Thu, 1 May 2014 12:53:43 +0000 (20:53 +0800)]
discover,ui: fix checks for debug option

We need to check for equality with opt_yes, not just check for non-zero.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/yaboot: support lilo & silo for x86 and Sparc.
Jeff Bailey [Sun, 26 Jan 2014 00:48:24 +0000 (00:48 +0000)]
discover/yaboot: support lilo & silo for x86 and Sparc.

The yaboot.conf format is essentially the same format as silo.conf and
lilo.conf, especially if the author isn't using OF paths. This is a
cheap way of getting support for silo and lilo.

Signed-off-by: Jeff Bailey <jeffbailey@google.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: only cancel default boot on valid key events
Jeremy Kerr [Tue, 22 Apr 2014 02:41:59 +0000 (10:41 +0800)]
ui/ncurses: only cancel default boot on valid key events

We're seeing occasionaly failures to autoboot due to supirious key
events (getch() returing -1) on an IPMI console.

This change modifies the process_key logic to only abort the default if
we see a valid key event.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/udev: NULL return from udev_enumerate_get_list_entry isn't an error
Jeremy Kerr [Thu, 17 Apr 2014 03:47:39 +0000 (11:47 +0800)]
discover/udev: NULL return from udev_enumerate_get_list_entry isn't an error

A NULL return can mean the list is empty; don't return a failure from
this case.

udev_list_entry_foreach does a check for a NULL entry, so we'll do the
correct thing in the following loop.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover/udev: fix double free on udev_init failures
Jeremy Kerr [Thu, 17 Apr 2014 03:40:09 +0000 (11:40 +0800)]
discover/udev: fix double free on udev_init failures

If the udev monitor or enumerate functions fail, we'll call the
udev_unref and udev_monitor_unref functions twice: once in the cleanup
path and once in the talloc destructor.

This change moves all cleanup to the talloc destructor, so we only do
the unrefs once.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Always provide a key definition for backtab
Jeremy Kerr [Tue, 15 Apr 2014 03:48:00 +0000 (11:48 +0800)]
ui/ncurses: Always provide a key definition for backtab

Petitboot environments will probably want a basic terminfo defintion
(eg, vt220) rather than a full linux or xterm, but vt220 and friends
don't define a backtab key. Backtab can be useful for proper form
navigation, and without a key definition, we just get an escape, which
exits the current screen.

This change provides a static definition for KEY_BTAB, so we should
always have one available.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Use a fixed-sized for small, known-length fields
Jeremy Kerr [Tue, 15 Apr 2014 03:08:39 +0000 (11:08 +0800)]
ui/ncurses: Use a fixed-sized for small, known-length fields

Fields without O_STATIC can "scroll" horizontally, and we may miss a
left-hand section of text from the current display. This can mean that
the user can't leave a validated field with no indication why, if the
off-to-the-left data is not a valid entry.

This change adds a widgetset function to mark a field as fixed-size, so
we don't have this scrolling behaviour. This means that the entire field
contents will always be visible, and any validation errors can be seen.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agodiscover: Fix uninitialised var warnings
Jeremy Kerr [Fri, 11 Apr 2014 08:11:51 +0000 (16:11 +0800)]
discover: Fix uninitialised var warnings

We get a couple of uninitialised var warning when compiling with certain
CFLAGS (-fprofile-arcs -ftest-coverage at this stage).

In statement_if_execute: We'll never actually use this uninitialised (as
there must be at least one conditional in the parsed statement), but we
should address the warning nonetheless.

As passed to strtok_r: strtok will initialise this, but it isn't obvious
to the compiler.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Ensure boot option labels are displayable as menu items
Jeremy Kerr [Thu, 13 Mar 2014 07:18:04 +0000 (15:18 +0800)]
ui/ncurses: Ensure boot option labels are displayable as menu items

ncurses' new_item() expects the name parameter to be a "printable
string", by converting it to a wchar *, and checking that each character
is printable with iswprint(). If it fails, we won't see a boot option at
all.

This change introduces a function to convert the label into something we
know is printable, and valid UTF-8. If mbstowcs fails, we replace it
with a generic 'Invalid option' label. If we encounter a valid multibyte
string with unprintable characters, we replace those with U+fffd
REPLACEMENT CHARACTER.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
5 years agoui/ncurses: Fix discover_client leak
Jeremy Kerr [Thu, 13 Mar 2014 05:28:00 +0000 (13:28 +0800)]
ui/ncurses: Fix discover_client leak

We're not freeing the discover_client on exit, as it's not attached to
any existing talloc context.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>