aboutsummaryrefslogtreecommitdiffstats
path: root/init.inc
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2006-09-22 23:24:45 -0700
committerH. Peter Anvin <hpa@zytor.com>2006-09-22 23:24:45 -0700
commitce38624d82626553018b85d210beb8ea34bd7eab (patch)
treedbdc3387cdfc596015a48b3f494e26476a04e7d1 /init.inc
parenta584b423450923389f4dc25480e30472c8641d38 (diff)
downloadsyslinux-elf-ce38624d82626553018b85d210beb8ea34bd7eab.tar.gz
syslinux-elf-ce38624d82626553018b85d210beb8ea34bd7eab.tar.xz
syslinux-elf-ce38624d82626553018b85d210beb8ea34bd7eab.zip
Add support for forcing the filetype, and loading a secondary config file.
Add support for forcing the filetype, and loading a secondary config file. Also bump the version number to version 3.40.
Diffstat (limited to 'init.inc')
-rw-r--r--init.inc26
1 files changed, 4 insertions, 22 deletions
diff --git a/init.inc b/init.inc
index a01c6e94..2f31b0ed 100644
--- a/init.inc
+++ b/init.inc
@@ -22,23 +22,10 @@ common_init:
; Now set up screen parameters
call adjust_screen
- ; Wipe the F-key area
- mov al,NULLFILE
- mov di,FKeyName
- mov cx,10*(1 << FILENAME_MAX_LG2)
- rep stosb
-
- mov si,linuxauto_cmd ; Default command: "linux auto"
- mov di,default_cmd
- mov cx,linuxauto_len
- rep movsb
-
- mov di,KbdMap ; Default keymap 1:1
- xor al,al
- inc ch ; CX <- 256
-mkkeymap: stosb
- inc al
- loop mkkeymap
+;
+; Initialize configuration information
+;
+ call reset_config
;
; Clear Files structures
@@ -57,9 +44,4 @@ mkkeymap: stosb
add ax,PKTBUF_SIZE
loop .setbufptr
%endif
-
- section .data
-linuxauto_cmd db 'linux auto',0
-linuxauto_len equ $-linuxauto_cmd
-
section .text ; This is an inline file...