Merge pull request #10 from themoken/master

[petitboot] / ui / ncurses / nc-config-help.c

diff --git a/ui/ncurses/nc-config-help.c b/ui/ncurses/nc-config-help.c
index 18c51d4691ba9ff9fadab246d567e8a49e4b1640..23bcd9d8bc8ed24cb53c9c9311513a56db23dd81 100644 (file)
--- a/ui/ncurses/nc-config-help.c
+++ b/ui/ncurses/nc-config-help.c
@@ -1,23 +1,26 @@
 #include "nc-helpscreen.h"
 
 struct help_text config_help_text = define_help_text("\
-Autoboot: There are three possible options for automatic-boot hehaviour:\n"
+Autoboot: Specify which devices to autoboot from.\n"
 "\n"
-"Don't autoboot: boot options will be listed in the petitboot menu, but none \
-will be booted automatically. User interaction will be required to continue \
-past the petitboot menu. Use this option if you want the machine to wait for \
-an explicit boot selection, or want to interact with petitboot before \
-booting the system\n"
+"By selecting the 'Add Device' button new devices can be added to the autoboot \
+list, either by UUID, MAC address, or device type. Once added to the boot \
+order, the priority of devices can be changed with the 'left' and 'right' keys \
+Devices can be individually removed from the boot order with the minus key. \
+Use this option if you have multiple operating system images installed.\n"
 "\n"
-"Autoboot from any disk/network device: any boot option that is marked as a \
-default (by bootloader configuration) will be booted automatically after a \
+"To autoboot from any device, select the 'Clear & Boot Any' button. \
+In this case, any boot option that is marked as a default \
+(by bootloader configuration) will be booted automatically after a \
 timeout. Use this option if you want to quickly boot your system without \
 changing any boot option settings. This is the typical configuration.\n"
 "\n"
-"Autoboot from a specific disk/network device: only boot options \
-from a single device (specifed here) will be booted automatically after a \
-timeout. Use this option if you have multiple operating system images \
-installed.\n"
+"To disable autoboot, select the 'Clear' button, which will clear the boot \
+order. \
+With autoboot disabled, user interaction will be required to continue past \
+the petitboot menu. Use this option if you want the machine to wait for an \
+explicit boot selection, or want to interact with petitboot before booting \
+the system\n"
 "\n"
 "Timeout: Specify the length of time, in seconds, that the main menu will be \
 displayed before the default boot option is started. This option is only \
@@ -37,4 +40,8 @@ only want to configure a single interface during boot.\n"
 "Static IP configuration: Allows you to specify an IPv4 address and network \
 mask, gateway, and a DNS server or servers for a network interface. Select \
 this option if you do not have a DHCP server, or want explicit control of \
-network settings.");
+network settings.\n"
+"\n"
+"Disk R/W: Certain bootloader configurations may request write access to \
+disks to save information or update parameters (eg. GRUB2). "
+"Use this option to control access to disks.\n");