Quick checkin between network hangs...

Restored trap calls in profile, and reset trap 2 at end of fsck.
Make installation of fourth floppy an option.

diff --git a/etc/etc.i386/inst1.install b/etc/etc.i386/inst1.install
index 9ce01d6..c337fa4 100644 (file)
--- a/etc/etc.i386/inst1.install
+++ b/etc/etc.i386/inst1.install
@@ -845,15 +845,22 @@ echo "install"
 echo "cd /"
 echo "umount /mnt >/dev/null 2>&1"
 echo "echo"
 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 "echo -n  \"Install optional dos floppy? [n] \""

 echo "read resp junk"
 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 "sync"
-echo "umount /mnt >/dev/null 2>&1"
+echo "case \"\$resp\" in"
+echo "y\*|Y\*)"
+echo " echo"   
+echo " echo    \"Now insert third installation (dos) 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 " sync"
+echo " umount /mnt >/dev/null 2>&1"
+echo " ;;"
+echo "esac"

 echo "echo"
 echo "echo     \"OK.  All of the base files are installed.\""
 echo "echo"
 echo "echo"
 echo "echo     \"OK.  All of the base files are installed.\""
 echo "echo"

diff --git a/etc/etc.i386/inst2.profile b/etc/etc.i386/inst2.profile
index 034677b..13eed71 100644 (file)
--- a/etc/etc.i386/inst2.profile
+++ b/etc/etc.i386/inst2.profile
@@ -1,6 +1,6 @@
 stty status '^T'
 stty status '^T'

-#trap : 2
-#trap : 3
+trap : 2
+trap : 3

 HOME=/; export HOME
 PATH=/sbin:/bin:/usr/sbin:/usr/bin; export PATH
 if [ -e /fastboot ]
 HOME=/; export HOME
 PATH=/sbin:/bin:/usr/sbin:/usr/bin; export PATH
 if [ -e /fastboot ]


@@ -48,6 +48,7 @@ else
        esac
 fi
 
        esac
 fi
 

+trap 2

 trap "echo 'Reboot interrupted'; exit 1" 3
 umount -a >/dev/null 2>&1
 mount -a -t nonfs
 trap "echo 'Reboot interrupted'; exit 1" 3
 umount -a >/dev/null 2>&1
 mount -a -t nonfs