Don't choose FS by labels after all.

diff --git a/tools/Makefile b/tools/Makefile
index bc00ec7aa34af39c6afcdfcf1c3e43e5c4b45dd4..def0d0223ca46edd52fa0afa4b64b778e7677259 100755 (executable)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -4,7 +4,7 @@ u=/usr
 CC=    exec cc
 CFLAGS=        -O -D_MINIX -D_POSIX_SOURCE
 MDEC=  /usr/mdec
-MAKE=  make -$(MAKEFLAGS)
+MAKE=  exec make -$(MAKEFLAGS)
 
 # Specify the programs that are part of the system image.
 # Multiple boot medium drivers can be included in the image, 
@@ -12,8 +12,7 @@ MAKE= make -$(MAKEFLAGS)
 # determined by the 'label=...' boot monitor parameter. 
 PROGRAMS=      ../kernel/kernel \
        ../servers/pm/pm \
-       BIG:../servers/fs/fs \
-       SMALL:../servers/fs/smallfs \
+       ../servers/fs/fs \
        ../servers/rs/rs \
        ../servers/ds/ds \
        ../drivers/tty/tty \
@@ -54,12 +53,16 @@ all: services image
 
 image:  includes
        cd ../kernel && $(MAKE) 
-       cd ../servers/fs && $(MAKE) EXTRA_OPTS=-D_MINIX_SMALL=1 clean fs && \
-               mv fs smallfs && make clean
        cd ../servers && $(MAKE) image
        cd ../drivers && $(MAKE) image
        installboot -image $@ $(PROGRAMS)
 
+image_small:  includes
+       cd ../kernel && $(MAKE) 
+       cd ../servers && $(MAKE) EXTRA_OPTS=-D_MINIX_SMALL=1 image
+       cd ../drivers && $(MAKE) EXTRA_OPTS=$(EXTRA_OPTS) image
+       installboot -image $@ $(PROGRAMS)
+
 # rebuild the program or system libraries
 includes:
        cd ../include && $(MAKE) install
@@ -97,5 +100,5 @@ clean:
        cd ../kernel && $(MAKE) $@
        cd ../servers && $(MAKE) $@
        cd ../drivers && $(MAKE) $@
-       rm -rf *.bak image *.iso *.iso.gz cdfdimage rootimage src
+       rm -rf *.bak image image_small *.iso *.iso.gz cdfdimage rootimage src
 

diff --git a/tools/mkboot b/tools/mkboot
index 2038278774b0f487bde148c5b5efb0da4f9ef8c2..06824f3effb2b1c490fcfb4ce3089af538804ded 100755 (executable)
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -182,11 +182,11 @@ cdfdboot)
        mkdir /mnt/boot
        mkdir /mnt/boot/image
        ( cd /mnt/dev && sh /usr/src/commands/scripts/MAKEDEV.sh std )
-       cp -p image /mnt/boot/image || exit 1
+       cp -p image image_* /mnt/boot/image || exit 1
        cp -p ../boot/boot /mnt/boot/boot || exit 1
        umount $dev || exit 1
        installboot -d $dev ../boot/bootblock boot/boot || exit 1
-       edparams $dev 'unset bootopts; unset servers; disable=inet; image=/boot/image/image; bootbig(1, Regular MINIX 3 (requires at least 16 MB RAM)) { label=BIG ; boot } bootsmall(2, Small MINIX 3 (intended for 8 MB systems)) { label=SMALL ; boot } cdproberoot=1; unset rootdev; unset leader; leader() { echo \n--- Welcome to MINIX 3. This is the boot monitor. ---\n\nChoose an option from the menu or press ESC if you need to do anything special.\nOtherwise I will boot with my defaults in 10 seconds.\n\n }; bootcd=1; main(){trap 10000 boot; menu; }; save' || exit
+       edparams $dev 'unset bootopts; unset servers; disable=inet; image=/boot/image/image_big; bootbig(1, Regular MINIX 3 (requires at least 16 MB RAM)) { image=/boot/image/image ; boot } bootsmall(2, Small MINIX 3 (intended for 8 MB systems)) { image=/boot/image/image_small ; boot } cdproberoot=1; unset rootdev; unset leader; leader() { echo \n--- Welcome to MINIX 3. This is the boot monitor. ---\n\nChoose an option from the menu or press ESC if you need to do anything special.\nOtherwise I will boot with my defaults in 10 seconds.\n\n }; bootcd=1; main(){trap 10000 boot; menu; }; save' || exit
 
        # copy image
        dd if=$dev of=cdfdimage bs=8192 count=180

diff --git a/tools/release.sh b/tools/release.sh
index ed7994d0cd1650d68eea7ad576f85228391b2452..c55fe9e42bfd665645f9f4e110bc9baebc542949 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -42,8 +42,8 @@ hdemu_root_changes()
 disable=inet
 bios_remap_first=1
 ramimagedev=c0d7p0s0
-bootbig(1, Regular MINIX 3) { label=BIG; boot }
-bootsmall(2, Small MINIX 3 (<16MB)) {label=SMALL; boot }
+bootbig(1, Regular MINIX 3) { unset image; boot }
+bootsmall(2, Small MINIX 3 (<16MB)) {image=/boot/image/image_small; boot }
 main() { trap 10000 boot ; menu; }
 save'  | $RELEASEDIR/usr/bin/edparams $TMPDISK3