summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMariano Lopez <mariano.lopez@linux.intel.com>2015-12-01 08:02:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-09 08:48:25 (GMT)
commitc59dc3bae09ccb3749539dd5f1ddc12e26591523 (patch)
tree1a5a81147cecd46a8451e53e4e5dc2c0751bd588 /scripts
parent70338732ac7d6cf8a012e6861c316bcbd66e1328 (diff)
downloadpoky-c59dc3bae09ccb3749539dd5f1ddc12e26591523.tar.gz
wic/help.py: Document the new option "configfile"
This just adds the "configfile" option for the bootloader to wic help. [YOCTO #8728] (From OE-Core rev: 597045657a1a635f667404306160f9ab2551e954) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/help.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py
index 9a778b6..89fb7be 100644
--- a/scripts/lib/wic/help.py
+++ b/scripts/lib/wic/help.py
@@ -740,6 +740,12 @@ DESCRIPTION
740 bootloader command-line - for example, the syslinux 740 bootloader command-line - for example, the syslinux
741 APPEND or grub kernel command line. 741 APPEND or grub kernel command line.
742 742
743 --configfile: Specifies a user defined configuration file for
744 the bootloader. This file must be located in the
745 canned-wks folder or could be the full path to the
746 file. Using this option will override any other
747 bootloader option.
748
743 Note that bootloader functionality and boot partitions are 749 Note that bootloader functionality and boot partitions are
744 implemented by the various --source plugins that implement 750 implemented by the various --source plugins that implement
745 bootloader functionality; the bootloader command essentially 751 bootloader functionality; the bootloader command essentially