Mostly cosmetic changes.

Added notes installing os-bs.

2 files changed, 43 insertions, 30 deletions

diff --git a/etc/etc.i386/floppy.install_notes b/etc/etc.i386/floppy.install_notes
index a22552b..81f2195 100644
--- a/etc/etc.i386/floppy.install_notes
+++ b/etc/etc.i386/floppy.install_notes
@@ -42,10 +42,11 @@ to make initial installation of the system as easy as possible.
 
 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
-    copy the kernel to, ``sd0a'' or ``wd0a'' (``sd0a'' is for SCSI systems,
-    ``wd0a'' is for all others.) When the system halts, go on to the next
-    step.
+    that floppy gives you.  If partitions  already exist on the hard disk,
+    then by default, FreeBSD attempts to install at the end of these.
+    Before rebooting, note the type of disk it says to copy the kernel
+    to, ``sd0a'' or ``wd0a'' (``sd0a'' is for SCSI systems, ``wd0a'' is
+    for all others.)  When the system halts, go on to the next step.
 
 3.  Boot the first floppy again, but this time when it asks
     you to insert the file system floppy, just press the return key.
@@ -108,9 +109,22 @@ to make initial installation of the system as easy as possible.
 	mv /.profile /.profile.install
 	ln /root/.profile /.profile
 
-14. In addition to the source and binary distributions, many additional
-    packages, such as X11 and TeX, may be obtained from freebsd.cdrom.com -
-    please have a look around!  You may also find this a good time to
-    read the release notes in /usr/src/RELNOTES.FreeBSD.
+14. If your system has several operating systems, you may want to install
+    the Thomas Wolfram's os-bs boot manager for selecting which system to
+    boot.  This works well with DOS, OS/2, FreeBSD and other systems.  To
+    install it, boot MS-DOS and insert the dos-floppy of the FreeBSD
+    install suite in floppy drive A:.  Then enter the DOS commands:
+    > A:
+    > os-bs135
+    > cd os-bs
+    > os-bs
+    Use the cursor keys to highlight the install option and hit
+    ENTER.  The readme.1st file in the os-bs directory contains
+    more information about os-bs.
+
+15. In addition to the FreeBSD  source and binary distributions, many 
+    additional packages, such as X11 and TeX, may be obtained from 
+    freebsd.cdrom.com - 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.4 1993/09/08 11:25:14 alm Exp $
+End of $Id: floppy.install_notes,v 1.5 1993/09/08 22:51:49 jkh Exp $
diff --git a/etc/etc.i386/inst1.install b/etc/etc.i386/inst1.install
index 58e9ac9..62e5dad 100755
--- a/etc/etc.i386/inst1.install
+++ b/etc/etc.i386/inst1.install
@@ -114,7 +114,8 @@ analyze_fdisk_data() {
 force_offset=
 if [ $cyls_per_disk -gt 1024 ]; then
 	echo
-	echo "WARNING: >1024 cylinders."
+	echo "	WARNING: >1024 cylinders.  On some hardware, this prevents"
+	echo "	${OPSYSTEM} from sharing the disk with other operating systems."
 	echo -n "Overwriting existing partitions - okay? [y] "
 	read resp junk
 	[ ! "$resp" ] && resp=y
@@ -143,8 +144,8 @@ fi
 # Case II: no partitions used
 if [ $sysid_cnt -eq 0 ]; then
 	echo
-	echo "WARNING: partition table is either missing or corrupt."
-	echo "Existing partitions will be lost."
+	echo "	WARNING: partition table is either missing or corrupt."
+	echo "	Existing partitions will be lost."
 	part_cnt=${part_cnt:-4}
 	RUN_FDISK="overwrite"
 	opsys_off=1
@@ -234,9 +235,9 @@ if [ $disk_remaining -lt $disk_minimum ]; then
 		;;
 	*)
 		echo
-		echo "WARNING: To install ${OPSYSTEM}, you're on your own in figuring"
-		echo "out where on the disk it will fit without overwriting another"
-		echo "partition..."
+		echo "	WARNING: To install ${OPSYSTEM}, you're on your own in figuring"
+		echo "	out where on the disk it will fit without overwriting another"
+		echo "	partition..."
 		# Set defaults assuming there is only one partition at end of disk
 		eval start=\$start${extent_max_part}
 		# don't use first cylinder!
@@ -400,10 +401,6 @@ sc*|SC*)
 esac
 echo
 echo    "Disk is of device type $drivetype."
-echo
-echo -n "Number of bytes per disk sector? [${bytes_per_sect:-512}] "
-read resp junk
-bytes_per_sect=${resp:-${bytes_per_sect:-512}}
 if [ ! "$partition" ]; then
 	echo
 	echo    "Please wait.  Examining device /dev/r${drivename}d..."
@@ -435,6 +432,10 @@ echo -n "Disk label name (one word, please)? [${name:-mfr_model}] "
 read resp junk
 name=${resp:-${name:-mfr_model}}
 echo
+echo -n "Number of bytes per disk sector? [${bytes_per_sect:-512}] "
+read resp junk
+bytes_per_sect=${resp:-${bytes_per_sect:-512}}
+echo
 echo -n "Total number of disk cylinders? [${cyls_per_disk:-${DEFCYLN}}] "
 read resp junk
 cyls_per_disk=${resp:-${cyls_per_disk:-${DEFCYLN}}}
@@ -479,8 +480,10 @@ while :; do
 		opsys_off=${resp:-${opsys_off:-1}}
 	else
 		echo
-		echo "WARNING: Installing at cylinder 0 overwrites DOS partition table."
-		echo "Existing partitions will be lost, and subsequent installs may fail."
+		echo "	WARNING: Existing partitions will be lost.  In addition,"
+		echo "	installing at cylinder 0 may cause problems for some disk" 
+		echo "	controllers.  If the filesystem is corrupted or install"
+		echo "	fails, install at cylinder 1."
 		RUN_FDISK=""
 		cyls_per_opsys=$cyls_per_disk
 		partition=$disksize
@@ -750,17 +753,13 @@ if [ "$sect_fwd" = "sf:" ]; then
 	echo " done."
 	echo "Updating badblock table..."
 	# `2>&1 >/dev/null' filters stdout and leaves only stderr...
-	bad144 -s $drivename 2>&1 >/dev/null |
+	badlist=$(bad144 -s $drivename 2>&1 >/dev/null |
 	while read data; do
-		bad_seek=`expr $data : '[^(]*(seek)[^0-9]*\([0-9]*\)'`
-		bad_read=`expr $data : '[^(]*(read)[^0-9]*\([0-9]*\)'`
+		bad_seek=$(expr "$data" : '[^(]*(seek)[^0-9]*\([0-9]*\)')
+		bad_read=$(expr "$data" : '[^(]*(read)[^0-9]*\([0-9]*\)')
 		[ "$bad_seek" -o "$bad_read" ] && echo -n "$bad_seek $bad_read "
-	done >bad144.out
-	if [ -s bad144.out ]; then
-		read badlist <bad144.out
-		bad144 -a -c $drivename "$badlist"
-		>bad144.out
-	fi
+	done)
+	[ "$badlist" ] && bad144 -a -c $drivename "$badlist"
 	echo " done."
 fi