diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-04-14 11:27:25 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-04-14 11:27:25 -0700 |
| commit | bc6a65ac83d9d8c53076bf90a846f95210fa3736 (patch) | |
| tree | a9c276023fb4b5fa00116e08ef37801a5930c9ef /core | |
| parent | 911dd342742a50867fc1bd7c4fc3a3285696431d (diff) | |
| parent | d05f79f204be71f7e60137b0cdc7bd69d30b7109 (diff) | |
| download | syslinux-bc6a65ac83d9d8c53076bf90a846f95210fa3736.tar.gz | |
Merge branch 'syslinux-3.7x'
Conflicts:
core/bootsect.inc
version
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/bootsect.inc | 4 | ||||
| -rw-r--r-- | core/pxelinux.asm | 4 | ||||
| -rw-r--r-- | core/runkernel.inc | 8 | ||||
| -rw-r--r-- | core/ui.inc | 19 |
4 files changed, 14 insertions, 21 deletions
diff --git a/core/bootsect.inc b/core/bootsect.inc index 7da4a25a..373c649d 100644 --- a/core/bootsect.inc +++ b/core/bootsect.inc @@ -116,8 +116,8 @@ replace_bootstrap: mov es,ax %if IS_PXELINUX - test byte [KeepPXE],02h ; Bit 1 = chainloading PXE - jz .stdstack + cmp byte [KeepPXE],0 + je .stdstack les di,[InitStack] ; Reset stack to PXE original jmp .stackok %endif diff --git a/core/pxelinux.asm b/core/pxelinux.asm index 0060ea65..b9ef963a 100644 --- a/core/pxelinux.asm +++ b/core/pxelinux.asm @@ -2001,8 +2001,8 @@ get_packet_gpxe: ; the memory. ; unload_pxe: - test byte [KeepPXE],01h ; Should we keep PXE around? - jnz reset_pxe + cmp byte [KeepPXE],0 ; Should we keep PXE around? + jne reset_pxe push ds push es diff --git a/core/runkernel.inc b/core/runkernel.inc index f13f1469..8bfc8b8d 100644 --- a/core/runkernel.inc +++ b/core/runkernel.inc @@ -95,12 +95,6 @@ construct_cmdline: ; parse_cmdline: mov di,cmd_line_here - xor ax,ax - mov [InitRDPtr],ax ; No initrd= option (yet) - mov [QuietBoot],al -%if IS_PXELINUX - and byte [KeepPXE],~2 -%endif .skipspace: mov al,[es:di] inc di .skipspace_loaded: @@ -176,7 +170,7 @@ opt_quiet: %if IS_PXELINUX opt_keeppxe: - or byte [KeepPXE],2 ; KeepPXE set by command line + or byte [KeepPXE],1 ; KeepPXE set by command line ret %endif diff --git a/core/ui.inc b/core/ui.inc index c02bfb2b..4c6e04a0 100644 --- a/core/ui.inc +++ b/core/ui.inc @@ -310,16 +310,6 @@ command_done: load_kernel: ; Load the kernel now ; -; Common initialization for all kernel types -; - xor ax,ax - mov [InitRDPtr],ax - mov [QuietBoot],al -%if IS_PXELINUX - mov [KeepPXE],al -%endif - -; ; First we need to mangle the kernel name the way DOS would... ; mov si,command_line @@ -603,6 +593,15 @@ kernel_good_saved: kernel_good: pushad + ; + ; Common initialization for all kernel types + ; + xor ax,ax + mov [InitRDPtr],ax + mov [QuietBoot],al +%if IS_PXELINUX + mov [KeepPXE],al +%endif mov si,KernelName mov di,KernelCName |