[src/trunk]: src/distrib/i386/floppies/fdset-common Make this capable of gene...

[mycroft <mycroft%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2e3022b14fef
branches:  trunk
changeset: 485792:2e3022b14fef
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Fri May 05 21:01:35 2000 +0000

description:
Make this capable of generating a single-floppy image.

diffstat:

 distrib/i386/floppies/fdset-common/Makefile.inc |  27 ++++++++++++------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diffs (61 lines):

diff -r 89690133a385 -r 2e3022b14fef distrib/i386/floppies/fdset-common/Makefile.inc
--- a/distrib/i386/floppies/fdset-common/Makefile.inc   Fri May 05 20:59:20 2000 +0000
+++ b/distrib/i386/floppies/fdset-common/Makefile.inc   Fri May 05 21:01:35 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.13 2000/05/05 20:13:32 mycroft Exp $
+#      $NetBSD: Makefile.inc,v 1.14 2000/05/05 21:01:35 mycroft Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -26,15 +26,9 @@
 CLEANFILES+=   netbsd boot ustar.tmp
 
 realall:       netbsd boot
+       tar cvf ${FSTMP} boot netbsd
+       @echo
        @echo Making disk number one
-       tar cvf ${FSTMP} boot netbsd
-       @ echo ''
-       @ls -l ${FSTMP} | (read mode links uid gid size junk;   \
-               disks=$$((($$size / (${DISKSIZE} * 512 - 8 * 1024)) + 1)); \
-                bytes=$$((${DISKSIZE} * 512 * $$disks - $$size));    \
-                echo There are $$bytes \($$(($$bytes / 1024))K\) bytes free\
-                        on disk $$disks.)
-       @ echo ''
        dd if=/dev/zero of=${IMAGE1} count=${DISKSIZE}
        vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE1}
        dd bs=8k seek=1 count=${BLOCK8K} if=${FSTMP} of=${VND_CDEV}
@@ -42,14 +36,13 @@
        @echo "installing new bootblocks"
        ${MDEC}/installboot -b 17 -v -f ${BOOTCODE} ${VND_RDEV}
        vnconfig -u ${VND_CDEV}
-       :
        @ls -l ${FSTMP} | (read mode links uid gid size junk; \
                dksize=$$((${DISKSIZE} * 512 - 8 * 1024)); \
+               disks=$$((($$size / (${DISKSIZE} * 512 - 8 * 1024)) + 1)); \
                if test $$size -gt $$dksize; then \
-                       disks=$$((($$size / (${DISKSIZE} * 512 - 8 * 1024)) \
-                               + 1)); \
                        d=2; \
                        while test $$d -le $$disks; do \
+                               echo; \
                                echo Making disk number $$d.; \
                                IMAGE=${BASENAME}$${d}.fs; \
                                PIMAGE=${BASENAME}$$(($$d - 1)).fs; \
@@ -72,7 +65,15 @@
                                fi; \
                                d=$$(($$d + 1)); \
                        done; \
-               fi; )
+               else \
+                       dd seek=$$(($${size} / 512 + 15)) count=1 \
+                               if=/dev/zero of=${IMAGE1}; \
+               fi; \
+               echo; \
+                bytes=$$(($$dksize * $$disks - $$size));    \
+                echo "There are $$bytes ($$(($$bytes / 1024))K) bytes free\
+                        on disk $$disks."; \
+       )
 
 # Let the kernel on the diskette be called "netbsd" although
 # it is compressed.  This is because the boot code will search