From 1da9c3f8d0ff0edd85d8772e5fe70c9cbe46bc87 Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Sat, 30 Mar 2002 21:55:11 +0000
Subject: [PATCH] Add support for auto2elf UPGRADE support.

---
 distrib/utils/sysinst/arch/vax/Makefile  | 4 ++--
 distrib/utils/sysinst/arch/vax/md.c      | 3 ++-
 distrib/utils/sysinst/arch/vax/md.h      | 6 +++++-
 distrib/utils/sysinst/arch/vax/msg.md.en | 9 ++++++++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/distrib/utils/sysinst/arch/vax/Makefile b/distrib/utils/sysinst/arch/vax/Makefile
index 43b66b548877..8649f1602bca 100644
--- a/distrib/utils/sysinst/arch/vax/Makefile
+++ b/distrib/utils/sysinst/arch/vax/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2001/01/14 02:38:22 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2002/03/30 21:55:11 matt Exp $
 #
 # Makefile for vax
 #
@@ -7,7 +7,7 @@
 
 SRCS=	menu_defs.c msg_defs.c main.c install.c upgrade.c \
 	txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \
-	label.c target.c md.c
+	label.c target.c md.c aout2elf.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/vax/md.c b/distrib/utils/sysinst/arch/vax/md.c
index 28275563550b..6787078be837 100644
--- a/distrib/utils/sysinst/arch/vax/md.c
+++ b/distrib/utils/sysinst/arch/vax/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.17 2001/01/14 02:38:23 mrg Exp $	*/
+/*	$NetBSD: md.c,v 1.18 2002/03/30 21:55:11 matt Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -174,6 +174,7 @@ md_check_partitions(void)
 int
 md_update(void)
 {
+	move_aout_libs();
 	endwin();
 	md_copy_filesystem();
 	md_post_newfs();
diff --git a/distrib/utils/sysinst/arch/vax/md.h b/distrib/utils/sysinst/arch/vax/md.h
index 3182b3dfcbd6..c7dd2eb18bfa 100644
--- a/distrib/utils/sysinst/arch/vax/md.h
+++ b/distrib/utils/sysinst/arch/vax/md.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.h,v 1.8 2001/11/29 23:21:02 thorpej Exp $	*/
+/*	$NetBSD: md.h,v 1.9 2002/03/30 21:55:11 matt Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -111,3 +111,7 @@ EXTERN	char *disk_names[]
  * Default file system type for floppies.
  */
 EXTERN char *fdtype INIT("ffs");
+
+#define	LIB_COUNT	0
+#define	LIB_MOVE	1
+
diff --git a/distrib/utils/sysinst/arch/vax/msg.md.en b/distrib/utils/sysinst/arch/vax/msg.md.en
index c8116817a693..4c8ecfbf3140 100644
--- a/distrib/utils/sysinst/arch/vax/msg.md.en
+++ b/distrib/utils/sysinst/arch/vax/msg.md.en
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.en,v 1.5 2000/12/03 01:54:50 minoura Exp $	*/
+/*	$NetBSD: msg.md.en,v 1.6 2002/03/30 21:55:12 matt Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -80,3 +80,10 @@ give sizes and mount points for the following partitions.
 message askfspart
 {The next partition is /dev/%s%c.  You have %d %s left on your disk.
 Partition size? }
+
+message emulbackup
+{Either the /emul/aout or /emul directory on your system was a symbolic link
+pointing to an unmounted filesystem. It has been given a '.old' extension.
+Once you bring your upgraded system back up, you may need to take care
+of merging the newly created /emul/aout directory with the old one.
+}