]> Zhao Yanbai Git Server - minix.git/commitdiff
boot: restore setting stack size, and remove wrong experimental
authorBen Gras <ben@minix3.org>
Wed, 23 Jun 2010 16:24:40 +0000 (16:24 +0000)
committerBen Gras <ben@minix3.org>
Wed, 23 Jun 2010 16:24:40 +0000 (16:24 +0000)
#ifndef DOS that shouldn't have been committed.

boot/Makefile
boot/bootimage.c

index e2181ef2bb487fbed044ab854ffec2781159d665..67aa1c58bf499266c8924e57399cda4d10f43a1f 100644 (file)
@@ -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}
index 243c83a4ad98cdd47585c0478c7999c82bcfe74f..3638199b10007eb096726b5ef8a6df204ff249ee 100644 (file)
@@ -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) {