[src/trunk]: src/distrib/utils/sysinst/arch Add aout2elf upgrade support.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4f3a432713e2
branches:  trunk
changeset: 524933:4f3a432713e2
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Apr 02 17:02:54 2002 +0000

description:
Add aout2elf upgrade support.

diffstat:

 distrib/utils/sysinst/arch/acorn32/Makefile  |   4 ++--
 distrib/utils/sysinst/arch/acorn32/md.c      |   3 ++-
 distrib/utils/sysinst/arch/acorn32/md.h      |   4 +++-
 distrib/utils/sysinst/arch/acorn32/msg.md.en |   9 ++++++++-
 distrib/utils/sysinst/arch/acorn32/msg.md.fr |  10 +++++++++-
 distrib/utils/sysinst/arch/shark/Makefile    |   4 ++--
 distrib/utils/sysinst/arch/shark/md.c        |   3 ++-
 distrib/utils/sysinst/arch/shark/md.h        |  18 ++++++++----------
 distrib/utils/sysinst/arch/shark/msg.md.en   |   9 ++++++++-
 distrib/utils/sysinst/arch/shark/msg.md.fr   |  10 +++++++++-
 10 files changed, 53 insertions(+), 21 deletions(-)

diffs (250 lines):

diff -r 4022ddeee61e -r 4f3a432713e2 distrib/utils/sysinst/arch/acorn32/Makefile
--- a/distrib/utils/sysinst/arch/acorn32/Makefile       Tue Apr 02 16:59:14 2002 +0000
+++ b/distrib/utils/sysinst/arch/acorn32/Makefile       Tue Apr 02 17:02:54 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2002/01/31 01:56:43 reinoud Exp $
+#      $NetBSD: Makefile,v 1.3 2002/04/02 17:11:20 thorpej Exp $
 #
 # Makefile for acorn32
 #
@@ -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 -r 4022ddeee61e -r 4f3a432713e2 distrib/utils/sysinst/arch/acorn32/md.c
--- a/distrib/utils/sysinst/arch/acorn32/md.c   Tue Apr 02 16:59:14 2002 +0000
+++ b/distrib/utils/sysinst/arch/acorn32/md.c   Tue Apr 02 17:02:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.2 2002/02/15 00:40:23 reinoud Exp $   */
+/*     $NetBSD: md.c,v 1.3 2002/04/02 17:11:20 thorpej Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -507,6 +507,7 @@
 int
 md_update(void)
 {
+       move_aout_libs();
        endwin();
        md_copy_filesystem();
        md_post_newfs();
diff -r 4022ddeee61e -r 4f3a432713e2 distrib/utils/sysinst/arch/acorn32/md.h
--- a/distrib/utils/sysinst/arch/acorn32/md.h   Tue Apr 02 16:59:14 2002 +0000
+++ b/distrib/utils/sysinst/arch/acorn32/md.h   Tue Apr 02 17:02:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.3 2002/03/12 19:35:55 reinoud Exp $   */
+/*     $NetBSD: md.h,v 1.4 2002/04/02 17:11:20 thorpej Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -119,6 +119,8 @@
  */
 EXTERN char *fdtype INIT("msdos");
 
+#define        LIB_COUNT       0
+#define        LIB_MOVE        1
 
 /*
  *  prototypes for MD code.
diff -r 4022ddeee61e -r 4f3a432713e2 distrib/utils/sysinst/arch/acorn32/msg.md.en
--- a/distrib/utils/sysinst/arch/acorn32/msg.md.en      Tue Apr 02 16:59:14 2002 +0000
+++ b/distrib/utils/sysinst/arch/acorn32/msg.md.en      Tue Apr 02 17:02:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.md.en,v 1.1 2002/01/31 00:33:50 reinoud Exp $      */
+/*     $NetBSD: msg.md.en,v 1.2 2002/04/02 17:11:21 thorpej Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -97,6 +97,13 @@
 {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.
+}
+
 message arm32fspart
 {We now have your NetBSD partitions on %s as follows (Size and Offset in %s):
 }
diff -r 4022ddeee61e -r 4f3a432713e2 distrib/utils/sysinst/arch/acorn32/msg.md.fr
--- a/distrib/utils/sysinst/arch/acorn32/msg.md.fr      Tue Apr 02 16:59:14 2002 +0000
+++ b/distrib/utils/sysinst/arch/acorn32/msg.md.fr      Tue Apr 02 17:02:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.md.fr,v 1.1 2002/01/31 00:33:50 reinoud Exp $      */
+/*     $NetBSD: msg.md.fr,v 1.2 2002/04/02 17:11:21 thorpej Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -102,6 +102,14 @@
 disque.
 Taille de la partition ? }
 
+message emulbackup
+{Ou /emul/aout ou répertoire d' /emul sur votre système était un lien symbolique
+se dirigeant à un filesystem non-monté. Il a été donné une extension d' 'old'. Une
+fois que vous apportez votre copie de sauvegarde améliorée de système, vous
+pouvez devoir prendre soin de fusionner nouvellement créé / répertoire
+d' /emul/aout avec le vieil.
+}
+
 message arm32fspart
 {Nous avons maintenant vos partitions NetBSD sur %s comme suit
 (taille et Offset en %s) :
diff -r 4022ddeee61e -r 4f3a432713e2 distrib/utils/sysinst/arch/shark/Makefile
--- a/distrib/utils/sysinst/arch/shark/Makefile Tue Apr 02 16:59:14 2002 +0000
+++ b/distrib/utils/sysinst/arch/shark/Makefile Tue Apr 02 17:02:54 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2002/02/10 19:20:53 thorpej Exp $
+#      $NetBSD: Makefile,v 1.2 2002/04/02 17:02:54 thorpej Exp $
 #
 # Makefile for arm32
 #
@@ -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 -r 4022ddeee61e -r 4f3a432713e2 distrib/utils/sysinst/arch/shark/md.c
--- a/distrib/utils/sysinst/arch/shark/md.c     Tue Apr 02 16:59:14 2002 +0000
+++ b/distrib/utils/sysinst/arch/shark/md.c     Tue Apr 02 17:02:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.1 2002/02/10 19:20:53 thorpej Exp $   */
+/*     $NetBSD: md.c,v 1.2 2002/04/02 17:02:54 thorpej Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -482,6 +482,7 @@
 int
 md_update(void)
 {
+       move_aout_libs();
        endwin();
        md_copy_filesystem();
        md_post_newfs();
diff -r 4022ddeee61e -r 4f3a432713e2 distrib/utils/sysinst/arch/shark/md.h
--- a/distrib/utils/sysinst/arch/shark/md.h     Tue Apr 02 16:59:14 2002 +0000
+++ b/distrib/utils/sysinst/arch/shark/md.h     Tue Apr 02 17:02:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.2 2002/03/31 02:14:06 thorpej Exp $   */
+/*     $NetBSD: md.h,v 1.3 2002/04/02 17:02:54 thorpej Exp $   */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -37,7 +37,7 @@
  *
  */
 
-/* md.h -- Machine specific definitions for the arm32 */
+/* md.h -- Machine specific definitions for the shark */
 
 /* Constants and defines */
 
@@ -50,9 +50,6 @@
  *      base, etc, comp, games, man, misc, text,
  *      xbase, xfont, xserver, xcontrib, xcomp.
  *
- * arm32 has the MD set kern first, because generic kernels are too
- * big to fit on install floppies. arm32 does not yet include xsets
- *
  * Third entry is the last extension name in the split sets for loading
  * from floppy.
  */
@@ -82,7 +79,7 @@
 /*
  * Disk names accepted as valid targets for a from-scratch installation.
  *
- * On arm32, we allow "wd" IDE disks and "sd" scsi disks.
+ * On shark, we allow "wd" IDE disks and "sd" scsi disks.
  */
 EXTERN char *disk_names[]
 #ifdef MAIN
@@ -95,14 +92,13 @@
  * this must return 1 for a character that matches the first
  * characters of each member of disk_names.
  *
- * On arm32, that means matching 'w' for ide and 's' for sd.
+ * On shark, that means matching 'w' for ide and 's' for sd.
  */
 #define ISDISKSTART(dn)        (dn == 'w' || dn == 's')
 
 /*
  * Machine-specific command to write a new label to a disk.
- * For example, arm32 uses "/sbin/disklabel -w -r", just like arm32
- * miniroot scripts, though this may leave a bogus incore label.
+ * For example, shark uses "/sbin/disklabel -w -r".
  * Sun ports should probably use  DISKLABEL_CMD "/sbin/disklabel -w"
  * to get incore to ondisk inode translation for the Sun proms.
  * If not defined, we assume the port does not support disklabels and
@@ -112,10 +108,12 @@
 
 /*
  * Default fileystem type for floppy disks.
- * On arm32, that is  msdos.
+ * On shark, that is msdos.
  */
 EXTERN char *fdtype INIT("msdos");
 
+#define        LIB_COUNT       0
+#define        LIB_MOVE        1
 
 /*
  *  prototypes for MD code.
diff -r 4022ddeee61e -r 4f3a432713e2 distrib/utils/sysinst/arch/shark/msg.md.en
--- a/distrib/utils/sysinst/arch/shark/msg.md.en        Tue Apr 02 16:59:14 2002 +0000
+++ b/distrib/utils/sysinst/arch/shark/msg.md.en        Tue Apr 02 17:02:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.md.en,v 1.1 2002/02/10 19:20:53 thorpej Exp $      */
+/*     $NetBSD: msg.md.en,v 1.2 2002/04/02 17:02:54 thorpej Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -97,6 +97,13 @@
 {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.
+}
+
 message arm32fspart
 {We now have your NetBSD partitions on %s as follows (Size and Offset in %s):
 }
diff -r 4022ddeee61e -r 4f3a432713e2 distrib/utils/sysinst/arch/shark/msg.md.fr
--- a/distrib/utils/sysinst/arch/shark/msg.md.fr        Tue Apr 02 16:59:14 2002 +0000
+++ b/distrib/utils/sysinst/arch/shark/msg.md.fr        Tue Apr 02 17:02:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.md.fr,v 1.1 2002/02/10 19:20:53 thorpej Exp $      */
+/*     $NetBSD: msg.md.fr,v 1.2 2002/04/02 17:02:54 thorpej Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -102,6 +102,14 @@
 disque.
 Taille de la partition ? }
 
+message emulbackup
+{Ou /emul/aout ou répertoire d' /emul sur votre système était un lien symbolique
+se dirigeant à un filesystem non-monté. Il a été donné une extension d' 'old'. Une
+fois que vous apportez votre copie de sauvegarde améliorée de système, vous
+pouvez devoir prendre soin de fusionner nouvellement créé / répertoire
+d' /emul/aout avec le vieil.
+}
+
 message arm32fspart
 {Nous avons maintenant vos partitions NetBSD sur %s comme suit
 (taille et Offset en %s) :