Clean these up a bunch more - gee I'm glad I do these snapshots, they uncover

*so many problems*.. Too bad the snaps themselves don't get made as a
consequence.. :-)

Bump the date forward Yet Another Day.  David has some changes he wants to
see rolled in, so I guess we're down for Feb 2nd as the snap date!

1 files changed, 5 insertions, 9 deletions

diff --git a/release/scripts/bininst.sh b/release/scripts/bininst.sh
index 39ac256..e23c68b 100755
--- a/release/scripts/bininst.sh
+++ b/release/scripts/bininst.sh
@@ -13,14 +13,7 @@
 # putting your name on top after doing something trivial like reindenting
 # it, just to make it look like you wrote it!).
 #
-# $Id: bininst.sh,v 1.5 1995/02/02 04:08:12 jkh Exp $
-
-if [ "${_BININST_LOADED_}" = "yes" ]; then
-	error "Error, $0 loaded more than once!"
-	return 1
-else
-	_BININST_LOADED_=yes
-fi
+# $Id: bininst.sh,v 1.6 1995/02/02 04:57:05 jkh Exp $
 
 # Grab the miscellaneous functions.
 . /stand/scripts/miscfuncs.sh
@@ -31,6 +24,9 @@ fi
 # Grab the network setup routines
 . /stand/scripts/netinst.sh
 
+# Grab the setup script
+. /stand/scripts/setup.sh
+
 # Deal with trigger-happy users.
 trap interrupt 1 2 15
 
@@ -50,7 +46,7 @@ welcome()
 
 do_last_config()
 {
-	sh /stand/scripts/setup.sh
+	setup
 	dialog --title "Auf Wiedersehen!" --msgbox \
 "Don't forget that the login name \"root\" has no password.
 If you didn't create any users with adduser, you can at least log in