From: Ben Gras Date: Wed, 23 Jun 2010 16:24:40 +0000 (+0000) Subject: boot: restore setting stack size, and remove wrong experimental X-Git-Tag: v3.1.8~378 X-Git-Url: http://zhaoyanbai.com/repos/man.named-journalprint.html?a=commitdiff_plain;h=ac310cbe09d1bb854bfaf4f73653d8e1649c5b07;p=minix.git boot: restore setting stack size, and remove wrong experimental #ifndef DOS that shouldn't have been committed. --- diff --git a/boot/Makefile b/boot/Makefile index e2181ef2b..67aa1c58b 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -30,6 +30,10 @@ LDADD.boot= -lsys BINDIR.boot= /usr/mdec MAN.boot= +all: .PHONY bootsize +bootsize: boot + ${INSTALL} -S 22kb boot + SRCS.masterboot= masterboot.s CPPFLAGS.masterboot.s= ${I86CPPFLAGS} LDFLAGS.masterboot= ${I86LDFLAGS} diff --git a/boot/bootimage.c b/boot/bootimage.c index 243c83a4a..3638199b1 100644 --- a/boot/bootimage.c +++ b/boot/bootimage.c @@ -767,10 +767,8 @@ char *select_image(char *image) ino_t image_ino; struct stat st; -#ifndef DOS image= strcpy(malloc((strlen(image) + 1 + NAME_MAX + 1) * sizeof(char)), image); -#endif fsok= r_super(&block_size) != 0; if (!fsok || (image_ino= r_lookup(ROOT_INO, image)) == 0) {