Merge lp:~andrew-bugs-launchpad-net/friendly-recovery/ubuntu into lp:~ubuntu-core-dev/friendly-recovery/ubuntu

[Andrew Sayers]

[Andrew Sayers (andrew-bugs-launchpad-net)]

This branch allows friendly-recovery to choose the set of options to display from the command-line, so "recovery-menu foo" prints one menu, whereas "recovery-menu bar" prints another. It also allows menu items to be displayed in arbitrary order, and tidies up a few minor aesthetic and development issues.

I am currently working on a blueprint (https://wiki.ubuntu.com/BlueScreenOfLife) that I would like to implement as an extension to friendly-recovery. My interest in this branch is to make it possible to build that extension to friendly-recovery, but I think this code would improve friendly-recovery in its own right.

Unmerged revisions

28. By Andrew Sayers <email address hidden> on 2009-02-16

Make friendly-recovery a bit friendlier and more extensible

* Allow options to be displayed in other than alphabetical order
* Print 1/2/3 instead of clean/dpkg/fsck in the menu
* Add a title "Emergency console"
* The "resume" action is no longer a special case
* Use a "$ROOT_DIR" variable instead of hard-coding /usr/share/recovery-mode
* Add hooks for other packages to extend friendly-recovery with other menus