Fix generation of dependencies for isolinux; fix totaltimeout command

diff --git a/Makefile b/Makefile
index 742ea12..024eff9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -124,33 +124,31 @@ kwdhash.gen: keywords genhash.pl
 
 ldlinux.bin: ldlinux.asm kwdhash.gen version.gen
        $(NASM) -f bin -DDATE_STR="'$(DATE)'" -DHEXDATE="$(HEXDATE)" \
-               -DMAP=ldlinux.map -l ldlinux.lst -o ldlinux.bin ldlinux.asm
+               -DMAP=$(@:.bin=.map) -l $(@:.bin=.lst) -o $@ $<
        $(PERL) checkov.pl ldlinux.map $@
 
 pxelinux.bin: pxelinux.asm kwdhash.gen version.gen
        $(NASM) -f bin -DDATE_STR="'$(DATE)'" -DHEXDATE="$(HEXDATE)" \
-               -DMAP=pxelinux.map -l pxelinux.lst -o pxelinux.bin pxelinux.asm
-       $(PERL) checkov.pl pxelinux.map $@
+               -DMAP=$(@:.bin=.map) -l $(@:.bin=.lst) -o $@ $<
+       $(PERL) checkov.pl $(@:.bin=.map) $@
 
 isolinux.bin: isolinux.asm kwdhash.gen version.gen checksumiso.pl
        $(NASM) -f bin -DDATE_STR="'$(DATE)'" -DHEXDATE="$(HEXDATE)" \
-               -DMAP=isolinux.map -l isolinux.lst -o isolinux.bin isolinux.asm
-       $(PERL) checkov.pl isolinux.map $@
+               -DMAP=$(@:.bin=.map) -l $(@:.bin=.lst) -o $@ $<
+       $(PERL) checkov.pl $(@:.bin=.map) $@
        $(PERL) checksumiso.pl $@
 
 # Special verbose version of isolinux.bin
-isolinux-debug.bin: isolinux.asm kwdhash.gen version.gen checksumiso.pl
+isolinux-debug.bin: isolinux-debug.asm kwdhash.gen version.gen checksumiso.pl
        $(NASM) -f bin -DDATE_STR="'$(DATE)'" -DHEXDATE="$(HEXDATE)" \
-               -DDEBUG_MESSAGES \
-               -DMAP=isolinux-debug.map -l isolinux-debug.lst \
-               -o isolinux-debug.bin isolinux.asm
-       $(PERL) checkov.pl isolinux-debug.map $@
+               -DMAP=$(@:.bin=.map) -l $(@:.bin=.lst) -o $@ $<
+       $(PERL) checkov.pl $(@:.bin=.map) $@
        $(PERL) checksumiso.pl $@
 
 extlinux.bin: extlinux.asm kwdhash.gen version.gen
        $(NASM) -f bin -DDATE_STR="'$(DATE)'" -DHEXDATE="$(HEXDATE)" \
-               -DMAP=extlinux.map -l extlinux.lst -o extlinux.bin extlinux.asm
-       $(PERL) checkov.pl extlinux.map $@
+               -DMAP=$(@:.bin=.map) -l $(@:.bin=.lst) -o $@ $<
+       $(PERL) checkov.pl $(@:.bin=.map) $@
 
 pxelinux.0: pxelinux.bin
        cp pxelinux.bin pxelinux.0

diff --git a/isolinux-debug.asm b/isolinux-debug.asm
new file mode 100644 (file)
index 0000000..c514d2d
--- /dev/null
+++ b/isolinux-debug.asm
@@ -0,0 +1,3 @@
+; $Id$
+%define DEBUG_MESSAGES 1
+%include "isolinux.asm"

diff --git a/ui.inc b/ui.inc
index c2c9e83..091a996 100644 (file)
--- a/ui.inc
+++ b/ui.inc
@@ -1,7 +1,7 @@
 ;; $Id$
 ;; -----------------------------------------------------------------------
 ;;   
-;;   Copyright 1994-2002 H. Peter Anvin - All Rights Reserved
+;;   Copyright 1994-2005 H. Peter Anvin - All Rights Reserved
 ;;
 ;;   This program is free software; you can redistribute it and/or modify
 ;;   it under the terms of the GNU General Public License as published by
@@ -435,6 +435,7 @@ getchar_timeout:
                pop cx                          ; Discard return address
                call vgahidecursor
                mov si,Ontimeout                ; Copy ontimeout command
+               mov di,command_line
                mov cx,[OntimeoutLen]           ; if we have one...
                rep movsb
                jmp command_done