diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-06-26 20:56:09 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-06-26 20:56:09 +0100 |
| commit | 9b8b5affd0d43fff833234f9c2b1425ec0447258 (patch) | |
| tree | 6d259f88d834485afb0742fee1de059db55b4881 | |
| parent | ddd5b71be1600aa323435351a82327acadc3d536 (diff) | |
| parent | 674cb69dfd5958caa94c34bc6ab29f5d02ccd313 (diff) | |
| download | syslinux-9b8b5affd0d43fff833234f9c2b1425ec0447258.tar.gz | |
Merge branch 'ipappend-fix-for-mfleming' of git://github.com/geneC/syslinux into elflink
Pull patches to standardize and document IPAPPEND/SYSAPPEND from Gene Cumm,
* 'ipappend-fix-for-mfleming' of git://github.com/geneC/syslinux:
doc/ & txt/: Document IPAPPEND/SYSAPPEND format
core & menu: fix IPAPPEND/SYSAPPEND conversion
| -rw-r--r-- | com32/elflink/ldlinux/readconfig.c | 2 | ||||
| -rw-r--r-- | com32/menu/readconfig.c | 2 | ||||
| -rw-r--r-- | doc/syslinux.txt | 3 | ||||
| -rw-r--r-- | txt/syslinux.cfg.txt | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c index d6e34bda..3ee825d7 100644 --- a/com32/elflink/ldlinux/readconfig.c +++ b/com32/elflink/ldlinux/readconfig.c @@ -1164,7 +1164,7 @@ do_include: allowoptions = !!atoi(skipspace(p + 12)); } else if ((ep = looking_at(p, "ipappend")) || (ep = looking_at(p, "sysappend"))) { - uint32_t s = strtoul(skipspace(ep), NULL, 16); + uint32_t s = strtoul(skipspace(ep), NULL, 0); if (ld.label) ld.ipappend = s; else diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c index adec8a7d..b7814be2 100644 --- a/com32/menu/readconfig.c +++ b/com32/menu/readconfig.c @@ -1046,7 +1046,7 @@ do_include: m->allowedit = !!atoi(skipspace(p + 12)); } else if ((ep = looking_at(p, "ipappend")) || (ep = looking_at(p, "sysappend"))) { - uint32_t s = atoi(skipspace(ep)); + uint32_t s = strtoul(skipspace(ep), NULL, 0); if (ld.label) ld.ipappend = s; else diff --git a/doc/syslinux.txt b/doc/syslinux.txt index a81cc649..43e20777 100644 --- a/doc/syslinux.txt +++ b/doc/syslinux.txt @@ -158,7 +158,8 @@ IPAPPEND bitmask The SYSAPPEND option was introduced in Syslinux 5.10; it is an enhancement of a previous option IPAPPEND which was only - available on PXELINUX. + available on PXELINUX. bitmask is interpretted as decimal format + unless prefixed with "0x" for hexidecimal. 1: indicates that an option of the following format should be generated and added to the kernel command line: diff --git a/txt/syslinux.cfg.txt b/txt/syslinux.cfg.txt index ff5d5337..f9e02b6b 100644 --- a/txt/syslinux.cfg.txt +++ b/txt/syslinux.cfg.txt @@ -128,7 +128,9 @@ section can be used to override a global *APPEND*. (*SYSAPPEND*: 5.10+; *IPAPPEND*: *PXELINUX* only) The *SYSAPPEND* option was introduced in *Syslinux* 5.10; it is an enhancement of a previous option *IPAPPEND* which was only available on -*PXELINUX*. The 'bitmask' is an OR (sum) of the following integer options: +*PXELINUX*. 'bitmask' is interpretted as decimal format unless prefixed +with "0x" for hexidecimal. The 'bitmask' is an OR (sum) of the +following integer options: ifndef::doctype-manpage[[horizontal]] *1*::: An option of the following format should be generated, based on |