diff options
| author | Sebastian Herbszt <herbszt@gmx.de> | 2009-05-02 19:07:15 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-02 12:23:41 -0700 |
| commit | 0d699852458728137b4bb9a115e99d0a620c4f6b (patch) | |
| tree | 562425269969c37393fffe19ad6ea28e7a54ee4e | |
| parent | 9bf2e30530b04c14e91a37f964a9bcfcaccd6c84 (diff) | |
| download | syslinux.git-0d699852458728137b4bb9a115e99d0a620c4f6b.tar.gz syslinux.git-0d699852458728137b4bb9a115e99d0a620c4f6b.tar.xz syslinux.git-0d699852458728137b4bb9a115e99d0a620c4f6b.zip | |
core: make vk_rname default to mangled vk_vname
Change pc_label in parseconfig.inc to default vk_rname to mangled
vk_vname. Also change spaces to tabs. This gives a usable error
message in the case where the user selects a label without any kernel
information.
| -rw-r--r-- | core/parseconfig.inc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/parseconfig.inc b/core/parseconfig.inc index ce5450c9..fd1c6511 100644 --- a/core/parseconfig.inc +++ b/core/parseconfig.inc @@ -311,15 +311,14 @@ pc_label: call commit_vk ; Commit any current vkernel loop .loop .done: mov byte [VKernel],1 ; We've seen a "label" statement - mov si,VKernelBuf+vk_vname ; By default, rname == vname + mov si,VKernelBuf+vk_vname ; By default, rname == mangled vname mov di,VKernelBuf+vk_rname - mov cx,FILENAME_MAX + call mangle_name + mov si,AppendBuf ; Default append==global append + mov di,VKernelBuf+vk_append + mov cx,[AppendLen] + mov [VKernelBuf+vk_appendlen],cx rep movsb - mov si,AppendBuf ; Default append==global append - mov di,VKernelBuf+vk_append - mov cx,[AppendLen] - mov [VKernelBuf+vk_appendlen],cx - rep movsb %if IS_PXELINUX ; PXELINUX only mov al,[IPAppend] ; Default ipappend==global ipappend mov [VKernelBuf+vk_ipappend],al |