diff --git a/etc/Makefile b/etc/Makefile index 5fbf6c366357..f8d009e92ef6 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -44,16 +44,16 @@ KC_FILES+= sbin/fsck sbin/halt sbin/init sbin/mount sbin/umount FILESYSTEM_DIRS= bin dev etc mnt sbin usr usr/bin usr/mdec usr/sbin FILESYSTEM_TREES= dev FILESYSTEM_FILES= ${COPYRIGHT} -FILESYSTEM_FILES+= bin/[ bin/cat bin/expr bin/ls bin/mkdir -FILESYSTEM_FILES+= bin/df +FILESYSTEM_FILES+= bin/[ bin/expr bin/ls bin/mkdir FILESYSTEM_FILES+= bin/sh bin/sync bin/test -FILESYSTEM_FILES+= dev/MAKEDEV dev/MAKEDEV.local +FILESYSTEM_FILES+= dev/MAKEDEV FILESYSTEM_FILES+= etc/group FILESYSTEM_FILES+= etc/master.passwd etc/passwd etc/pwd.db etc/spwd.db FILESYSTEM_FILES+= sbin/disklabel sbin/halt sbin/init FILESYSTEM_FILES+= sbin/mount sbin/mount_isofs sbin/mount_pcfs FILESYSTEM_FILES+= sbin/newfs FILESYSTEM_FILES+= sbin/umount +FILESYSTEM_FILES+= sbin/fdisk FILESYSTEM_FILES+= usr/bin/cpio FILESYSTEM_FILES+= ${MDEC} FILESYSTEM_FILES+= usr/sbin/bad144 @@ -71,6 +71,10 @@ CPIO_CPIO+= usr/bin/elvis usr/bin/ex usr/bin/vi usr/bin/view CPIO_CPIO+= usr/sbin/update usr/sbin/chown CPIO_CPIO+= var +DOS_FILES= bin/cat bin/dd bin/df bin/ed +DOS_FILES+= usr/bin/cksum usr/bin/mt +DOS_FILES+= sbin/mknod sbin/ping sbin/shutdown sbin/st sbin/reboot + CRYPT_LIB= lib/libcrypt CRYPT_SRCS= bin/ed bin/rcp CRYPT_SRCS+= libexec/ftpd libexec/makekey libexec/rexecd libexec/rlogind @@ -235,7 +239,8 @@ filesystem-floppy: (cd ${MOUNT}/dev; \ sh ${DESTDIR}/dev/MAKEDEV std; \ rm -rf fd; \ - sh ${DESTDIR}/dev/MAKEDEV fd0 wd0 sd0 sd1) + sh ${DESTDIR}/dev/MAKEDEV fd0 fd1 wd0 sd0 sd1 + rm -f ${DESTDIR}/dev/rfd1[b-z] ${DESTDIR}/dev/fd1[b-z]) (cd ${DESTDIR}/; \ ls ${FILESYSTEM_FILES} | cpio -pdamuv ${MOUNT}) install -c -o root -g wheel -m 755 etc.i386/inst1.profile \ @@ -278,6 +283,18 @@ cpio-floppy: gzip --no-name -9 -c ${RELEASEDIR}/floppies/cpio-floppy \ >${RELEASEDIR}/floppies/cpio-floppy.gz +dos-floppy: + mount -t pcfs /dev/${FLOPPY}a ${MOUNT} + (cd ${DESTDIR}/; \ + cp /sys/i386/floppy/* ${MOUNT}; \ + cp ${DOS_FILES} ${MOUNT}) + df -ik ${MOUNT} + umount /dev/${FLOPPY}a + dd if=/dev/r${FLOPPY}a of=${RELEASEDIR}/floppies/dos-floppy \ + bs=15b count=160 + gzip --no-name -9 -c ${RELEASEDIR}/floppies/dos-floppy \ + >${RELEASEDIR}/floppies/dos-floppy.gz + bin-tarball: (cd ${DESTDIR}; \ tar cf - . | gzip --no-name -9 -c | \ diff --git a/etc/etc.i386/floppy.install_notes b/etc/etc.i386/floppy.install_notes index f6af78ce44d2..9c6ca7c64fd6 100644 --- a/etc/etc.i386/floppy.install_notes +++ b/etc/etc.i386/floppy.install_notes @@ -32,9 +32,14 @@ to make initial installation of the system as easy as possible. Next, make a second floppy from the disk image: filesystem-floppy You'll need this for the second stage of the boot process. - Finally, make a third floppy from the disk image: cpio-floppy + Next, make a third floppy from the disk image: cpio-floppy You'll need this for the last stage of the boot process. + Finally, make a fourth floppy from the disk image: dos-floppy + You'll need this for the last stage of the boot process. + This disk is MS-DOS readable and contains the os-bs boot manager + (for if you are installing more than one operating system on disk.) + 2. Boot the first floppy. When it asks you to insert the file system, insert your second ``filesystem-floppy.'' Follow the instructions that floppy gives you, making note of the type of disk it says to @@ -56,7 +61,12 @@ to make initial installation of the system as easy as possible. Note that 0 is the same as DOS drive A:, and 1 is the same as DOS drive B: -5. After the cpio-floppy has been copied to the disk, enter ``halt''. +5. After the cpio-floppy has been copied to the disk, remove it from the + drive and insert the fourth floppy (dos-floppy). Again, specify the + drive to read from. + +5. After the dos-floppy has been copied to the disk, enter `halt' at + the command prompt. 6. When the system asks you to press the return key to reboot, first remove the floppy and then press the return key to boot from the hard @@ -103,4 +113,4 @@ to make initial installation of the system as easy as possible. please have a look around! You may also find this a good time to read the release notes in /usr/src/RELNOTES.FreeBSD. -End of $Id: floppy.install_notes,v 1.2 1993/09/02 00:04:15 jkh Exp $ +End of $Id: floppy.install_notes,v 1.3 1993/09/02 02:04:33 rgrimes Exp $ diff --git a/etc/etc.i386/inst1.install b/etc/etc.i386/inst1.install index 114c4bccfcfb..dc2512c50a37 100755 --- a/etc/etc.i386/inst1.install +++ b/etc/etc.i386/inst1.install @@ -115,28 +115,33 @@ force_offset= if [ $cyls_per_disk -gt 1024 ]; then echo echo "WARNING: >1024 cylinders." - echo "Overwriting existing partitions - okay? [y] " + echo -n "Overwriting existing partitions - okay? [y] " read resp junk [ ! "$resp" ] && resp=y case "$resp" in y*|Y*) + RUN_FDISK="" force_offset=1 + opsys_off=0 + cyls_per_opsys=${cyls_per_disk} + opsys_part=${unused_last_part:-3} + return 0 ;; *) echo - echo "If the number of disk cylinders does exceed 1024, then ${OPSYSTEM}" + echo "If the number of disk cylinders does not exceed 1024, then ${OPSYSTEM}" echo "can be installed alongside other operating systems on a single disk." - echo "Otherwise, ${OPSYSTEM} MUST be installed at the beginning of the disk," - echo "and existing partitions will be lost." + echo "Otherwise, it is system-dependent whether this will work or not." + echo "In the worst case, ${OPSYSTEM} MUST be installed at the beginning of" + echo "the disk, and existing partitions will be lost." + echo + echo "For now, we will assume that >1024 cylinders creates no problems..." + # FALL THROUGH ;; esac - RUN_FDISK="" - opsys_off=0 - cyls_per_opsys=${cyls_per_disk} - opsys_part=${unused_last_part:-3} - return 0 +fi # Case II: no partitions used -elif [ $sysid_cnt -eq 0 ]; then +if [ $sysid_cnt -eq 0 ]; then echo echo "WARNING: partition table is either missing or corrupt." echo "Existing partitions will be lost." @@ -845,6 +850,26 @@ echo "driveno=\${resp:-0}" echo "mount -o ro /dev/fd\${driveno}a /mnt" echo "cd /mnt" echo "install" +echo "cd /" +echo "umount /mnt >/dev/null 2>&1" +echo "echo" +echo "echo \"Now insert third installation floppy in drive and\"" +echo "echo -n \"enter that drive's number (e.g. 0 or 1): [0] \"" +echo "read resp junk" +echo "driveno=\${resp:-0}" +echo "mount -t pcfs -o ro /dev/fd\${driveno}a /mnt" +echo "mkdir -p /usr/distbin" +echo "cp /mnt/* /usr/distbin/" +echo "umount /mnt >/dev/null 2>&1" +echo "echo" +echo "echo \"OK. All of the base files are installed.\"" +echo "echo" +echo "echo \"The next step: reboot from the hard disk, and follow\"" +echo "echo \"more instrutctions.\"" +echo "echo" +echo "echo \"To do this, enter 'halt' at the prompt to halt the machine.\"" +echo "echo \"Once the machine has halted, remove the floppy from the disk\"" +echo "echo \"drive, and hit any key to reboot from the hard disk.\"" ) >.profile sync @@ -856,8 +881,8 @@ echo echo "To do this, enter 'halt' now to halt the machine. After it" echo "announces that it has halted, remove the floppy from the drive" echo "and insert the kernel-copy disk that was booted before." -echo "Press any key to reboot. Then when prompted to insert the file" -echo "system floppy this time, just hit RETURN without changing floppies." +echo "Press any key to reboot. When prompted to insert the filesystem" +echo "floppy this time, just hit RETURN without changing floppies." echo echo "If all goes well, you can enter the command \`copy' at the prompt to" echo "copy the kernel to the hard disk. When asked for which partition to" diff --git a/etc/etc.i386/inst2.install b/etc/etc.i386/inst2.install index f2d53824e9ba..5de373a7b3d7 100755 --- a/etc/etc.i386/inst2.install +++ b/etc/etc.i386/inst2.install @@ -28,18 +28,10 @@ cd /mnt ls .profile install usr/bin/* | cpio -pdmu${cpioverbose} / cd /dev echo " done." +echo echo "Building /dev files..." sh MAKEDEV all cd / echo " done." sync - -echo "OK. All of the base files are installed." -echo "" -echo "The next step: reboot from the hard disk, and follow" -echo "more instrutctions." -echo "" -echo "To do this, enter 'halt' at the prompt to halt the machine." -echo "Once the machine has halted, remove the floppy from the disk" -echo "drive, and hit any key to reboot from the hard disk."