sync to netbsd

6 files changed, 18 insertions, 15 deletions

diff --git a/distrib/pc532/floppies/upgr/Makefile b/distrib/pc532/floppies/upgr/Makefile
index 246d91c455f..c5b9660514a 100644
--- a/distrib/pc532/floppies/upgr/Makefile
+++ b/distrib/pc532/floppies/upgr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1995/10/18 08:37:43 deraadt Exp $
+#	$Id: Makefile,v 1.2 1996/09/05 21:27:00 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
diff --git a/distrib/pc532/floppies/upgr/dot.hdprofile b/distrib/pc532/floppies/upgr/dot.hdprofile
index c516921d862..e5428ac9a2d 100644
--- a/distrib/pc532/floppies/upgr/dot.hdprofile
+++ b/distrib/pc532/floppies/upgr/dot.hdprofile
@@ -1,4 +1,3 @@
-#	$OpenBSD: dot.hdprofile,v 1.2 1996/04/25 21:30:52 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -27,6 +26,8 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (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.hdprofile,v 1.3 1996/09/05 21:27:01 deraadt Exp $
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
@@ -56,6 +57,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	. /.commonutils
 	. /.upgrutils
 
-	echo "Follow the installation directions to install the OpenBSD"
+	echo "Follow the installation directions to install the NetBSD"
 	echo "distribution sets."
 fi
diff --git a/distrib/pc532/floppies/upgr/dot.profile b/distrib/pc532/floppies/upgr/dot.profile
index 6d3172db208..5e62fae9684 100644
--- a/distrib/pc532/floppies/upgr/dot.profile
+++ b/distrib/pc532/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.1 1995/10/18 08:37:43 deraadt Exp $
+#       $Id: dot.profile,v 1.2 1996/09/05 21:27:02 deraadt Exp $
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
diff --git a/distrib/pc532/floppies/upgr/dot.upgrutils b/distrib/pc532/floppies/upgr/dot.upgrutils
index f3b614ad163..431f5e41987 100644
--- a/distrib/pc532/floppies/upgr/dot.upgrutils
+++ b/distrib/pc532/floppies/upgr/dot.upgrutils
@@ -1,4 +1,3 @@
-#	$OpenBSD: dot.upgrutils,v 1.2 1996/04/25 21:30:56 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -27,10 +26,12 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (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.upgrutils,v 1.3 1996/09/05 21:27:03 deraadt Exp $
 
 # Upgrade cleanup utilites (functions), to make sure a recently-upgraded
 # system is safely runnable.  These are meant to be invoked from the shell
-# prompt, by people installing OpenBSD.
+# prompt, by people installing NetBSD.
 
 Cleanup()
 {
@@ -48,7 +49,7 @@ Cleanup()
 	echo	"Done."
 
 	echo	""
-	echo	"All that's left to do now is to install a new OpenBSD kernel"
+	echo	"All that's left to do now is to install a new NetBSD kernel"
 	echo	"on your hard disk.  You should now halt your machine using"
 	echo	"the 'halt' command.  Once the machine is halted, replace the"
 	echo	"installation floppy with the kernel-copy floppy and hit any"
diff --git a/distrib/pc532/floppies/upgr/list b/distrib/pc532/floppies/upgr/list
index e4be825d30a..10cb3c3a1db 100644
--- a/distrib/pc532/floppies/upgr/list
+++ b/distrib/pc532/floppies/upgr/list
@@ -1,4 +1,4 @@
-#	$Id: list,v 1.1 1995/10/18 08:37:43 deraadt Exp $
+#	$Id: list,v 1.2 1996/09/05 21:27:04 deraadt Exp $
 
 # and the upgrade tools
 COPY	dot.profile			.profile
diff --git a/distrib/pc532/floppies/upgr/upgrade.sh b/distrib/pc532/floppies/upgr/upgrade.sh
index 645dccac5a2..9a89cb332b1 100644
--- a/distrib/pc532/floppies/upgr/upgrade.sh
+++ b/distrib/pc532/floppies/upgr/upgrade.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-#	$OpenBSD: upgrade.sh,v 1.3 1996/06/29 05:54:21 tholo Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -28,8 +27,10 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (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: upgrade.sh,v 1.4 1996/09/05 21:27:06 deraadt Exp $
 
-#	OpenBSD upgrade script.
+#	NetBSD upgrade script.
 #	In a perfect world, this would be a nice C program, with a reasonable
 #	user interface.
 
@@ -47,9 +48,9 @@ getresp() {
 	fi
 }
 
-echo	"Welcome to the OpenBSD ${VERSION} upgrade program."
+echo	"Welcome to the NetBSD ${VERSION} upgrade program."
 echo	""
-echo	"This program is designed to help you put the new version of OpenBSD"
+echo	"This program is designed to help you put the new version of NetBSD"
 echo	"on your hard disk, in a simple and rational way.  To upgrade, you"
 echo	"must have plenty of free space on all partitions which will be"
 echo	"upgraded.  If you have at least 1MB free on your root partition,"
@@ -229,7 +230,7 @@ echo	"Done."
 echo	""
 echo	"Copying bootstrapping binaries and config files to the hard drive..."
 $DONTDOIT cp /mnt/.profile /mnt/.profile.bak
-$DONTDOIT pax -rw -X -k . /mnt
+$DONTDOIT tar --exclude etc --one-file-system -cf - . | (cd /mnt ; tar --unlink -xpf - )
 $DONTDOIT mv /mnt/etc/rc /mnt/etc/rc.bak
 $DONTDOIT cp /tmp/.hdprofile /mnt/.profile
 
@@ -241,11 +242,11 @@ echo	"Done."
 echo    ""
 echo    ""
 echo	"OK!  The preliminary work of setting up your disk is now complete,"
-echo	"and you can now upgrade the actual OpenBSD software."
+echo	"and you can now upgrade the actual NetBSD software."
 echo	""
 echo	"Right now, your hard disk is mounted on /mnt.  You should consult"
 echo	"the installation notes to determine how to load and install the new"
-echo	"OpenBSD distribution sets, and how to clean up after the upgrade"
+echo	"NetBSD distribution sets, and how to clean up after the upgrade"
 echo	"software, when you are done."
 echo	""
 echo	"GOOD LUCK!"