remove funky mount_* links, no need for update, no -lcrypt

7 files changed, 10 insertions, 30 deletions

diff --git a/distrib/i386/floppies/inst-common/instbin.conf b/distrib/i386/floppies/inst-common/instbin.conf
index aea98d7100e..e4eea0e157f 100644
--- a/distrib/i386/floppies/inst-common/instbin.conf
+++ b/distrib/i386/floppies/inst-common/instbin.conf
@@ -1,6 +1,6 @@
-#	$OpenBSD: instbin.conf,v 1.6 1996/05/14 14:50:26 mickey Exp $
+#	$OpenBSD: instbin.conf,v 1.7 1996/06/16 10:25:17 deraadt Exp $
 #
-# kcbin.conf - unified binary for the kc floppy
+# instbin.conf - unified binary for the inst/upgr floppies
 #
 
 srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
@@ -10,7 +10,6 @@ progs gzip ifconfig init less ln ls mkdir mknod mount mount_cd9660
 progs mount_ffs mount_msdos mount_nfs mount_kernfs
 progs mv newfs ping pwd reboot rm route
 progs sed sh shutdown slattach strings stty sync tar test tip umount
-progs update
 
 ln chown chgrp
 ln fsck_ffs fsck
@@ -19,11 +18,6 @@ ln gzip gzcat gunzip
 ln less more
 ln sh -sh		# init invokes the shell this way
 ln test [
-ln mount_cd9660 cd9660
-ln mount_ffs ffs
-ln mount_msdos msdos
-ln mount_nfs nfs
-ln mount_kernfs kernfs
 ln reboot halt
 
-libs -ledit -lutil -ltermcap -lcrypt -lkrb -ldes -ll -lm
+libs -ledit -lutil -ltermcap -lkrb -ldes -ll -lm
diff --git a/distrib/i386/floppies/inst-common/list b/distrib/i386/floppies/inst-common/list
index 8d8ca20911e..2c6098094ec 100644
--- a/distrib/i386/floppies/inst-common/list
+++ b/distrib/i386/floppies/inst-common/list
@@ -1,4 +1,4 @@
-#	$Id: list,v 1.4 1996/02/02 07:24:32 dm Exp $
+#	$Id: list,v 1.5 1996/06/16 10:25:18 deraadt Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -53,7 +53,6 @@ SYMLINK	/bin/cat		usr/bin/tip
 SYMLINK	/bin/cat		usr/sbin/bad144
 SYMLINK	/bin/cat		usr/sbin/chown
 SYMLINK	/bin/cat		usr/sbin/chroot
-SYMLINK	/bin/cat		usr/sbin/update
 SPECIAL	/bin/rm instbin
 
 # copy the MAKEDEV script and make some devices
diff --git a/distrib/i386/floppies/inst/dot.hdprofile b/distrib/i386/floppies/inst/dot.hdprofile
index 38b93ee9d15..5f3782e72f3 100644
--- a/distrib/i386/floppies/inst/dot.hdprofile
+++ b/distrib/i386/floppies/inst/dot.hdprofile
@@ -1,4 +1,4 @@
-#	$OpenBSD: dot.hdprofile,v 1.4 1996/04/25 21:28:04 niklas Exp $
+#	$OpenBSD: dot.hdprofile,v 1.5 1996/06/16 10:25:13 deraadt Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -50,9 +50,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
 	echo ''
 
-	# run update, so that installed software is written as it goes.
-	update
-
 	# pull in the functions that people will use from the shell prompt.
 	. /.commonutils
 	. /.instutils
diff --git a/distrib/i386/floppies/inst/dot.profile b/distrib/i386/floppies/inst/dot.profile
index 185c09a8254..35d77b72b0f 100644
--- a/distrib/i386/floppies/inst/dot.profile
+++ b/distrib/i386/floppies/inst/dot.profile
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#       $Id: dot.profile,v 1.3 1995/12/14 07:00:10 deraadt Exp $
+#       $Id: dot.profile,v 1.4 1996/06/16 10:25:15 deraadt Exp $
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
@@ -44,9 +44,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
 	echo ''
 
-	# run update, so that installed software is written as it goes.
-	update
-
 	# mount the kern_fs so that we can examine the dmesg state
 	mount -t kernfs /kern /kern
 
diff --git a/distrib/i386/floppies/kc/kcbin.conf b/distrib/i386/floppies/kc/kcbin.conf
index 0935c8a7e8a..cff1ed443cd 100644
--- a/distrib/i386/floppies/kc/kcbin.conf
+++ b/distrib/i386/floppies/kc/kcbin.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: kcbin.conf,v 1.2 1996/06/16 09:15:33 deraadt Exp $	
+#	$OpenBSD: kcbin.conf,v 1.3 1996/06/16 10:25:21 deraadt Exp $	
 #
 # kcbin.conf - unified binary for the kc floppy
 #
@@ -9,8 +9,7 @@ progs cp dd disklabel fsck_ffs init mount mount_ffs reboot sh test umount
 
 ln test [
 ln fsck_ffs fsck
-ln mount_ffs ffs
 ln reboot halt
 ln sh -sh		# init invokes the shell this way
 
-libs -ledit -lutil -ltermcap -lcrypt -ll
+libs -ledit -lutil -ltermcap -ll
diff --git a/distrib/i386/floppies/upgr/dot.hdprofile b/distrib/i386/floppies/upgr/dot.hdprofile
index deb35d30361..a1aed4eccfb 100644
--- a/distrib/i386/floppies/upgr/dot.hdprofile
+++ b/distrib/i386/floppies/upgr/dot.hdprofile
@@ -1,4 +1,4 @@
-#	$OpenBSD: dot.hdprofile,v 1.3 1996/04/25 21:28:28 niklas Exp $
+#	$OpenBSD: dot.hdprofile,v 1.4 1996/06/16 10:25:23 deraadt Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -49,9 +49,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
 	echo ''
 
-	# run update, so that installed software is written as it goes.
-	update
-
 	# pull in the functions that people will use from the shell prompt.
 	. /.commonutils
 	. /.upgrutils
diff --git a/distrib/i386/floppies/upgr/dot.profile b/distrib/i386/floppies/upgr/dot.profile
index d6b5063c445..f19b81fcb47 100644
--- a/distrib/i386/floppies/upgr/dot.profile
+++ b/distrib/i386/floppies/upgr/dot.profile
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#       $Id: dot.profile,v 1.2 1995/11/06 21:27:44 deraadt Exp $
+#       $Id: dot.profile,v 1.3 1996/06/16 10:25:24 deraadt Exp $
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
@@ -44,9 +44,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
 	echo ''
 
-	# run update, so that installed software is written as it goes.
-	update
-
 	# pull in the functions that people will use from the shell prompt.
 	. /.commonutils
 	. /.upgrutils