Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add aout2elf upgrade support.

Browse Source
This commit is contained in:
thorpej 2002-04-02 17:02:54 +00:00
parent 56d2b07be1
commit c7eb256693
10 changed files with 53 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/utils/sysinst/arch/acorn32/Makefile
View File

@ -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 # Makefile for acorn32
# #
@ -7,7 +7,7 @@
SRCS= menu_defs.c msg_defs.c main.c install.c upgrade.c \ 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 \ 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 md.o: menu_defs.h msg_defs.h

3
distrib/utils/sysinst/arch/acorn32/md.c
View File

@ -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. * Copyright 1997 Piermont Information Systems Inc.
@ -507,6 +507,7 @@ int md_make_bsd_partitions (void)
int int
md_update(void) md_update(void)
{ {
move_aout_libs();
endwin(); endwin();
md_copy_filesystem(); md_copy_filesystem();
md_post_newfs(); md_post_newfs();

4
distrib/utils/sysinst/arch/acorn32/md.h
View File

@ -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. * Copyright 1997 Piermont Information Systems Inc.
@ -119,6 +119,8 @@ EXTERN char *disk_names[]
*/ */
EXTERN char *fdtype INIT("msdos"); EXTERN char *fdtype INIT("msdos");
#define LIB_COUNT 0
#define LIB_MOVE 1
/* /*
* prototypes for MD code. * prototypes for MD code.

9
distrib/utils/sysinst/arch/acorn32/msg.md.en
View File

@ -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. * Copyright 1997 Piermont Information Systems Inc.
@ -97,6 +97,13 @@ message askfspart
{The next partition is /dev/%s%c. You have %d %s left on your disk. {The next partition is /dev/%s%c. You have %d %s left on your disk.
Partition size? } 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 message arm32fspart
{We now have your NetBSD partitions on %s as follows (Size and Offset in %s): {We now have your NetBSD partitions on %s as follows (Size and Offset in %s):
} }

10
distrib/utils/sysinst/arch/acorn32/msg.md.fr
View File

@ -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. * Copyright 1997 Piermont Information Systems Inc.
@ -102,6 +102,14 @@ message askfspart
disque. disque.
Taille de la partition ? } 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 message arm32fspart
{Nous avons maintenant vos partitions NetBSD sur %s comme suit {Nous avons maintenant vos partitions NetBSD sur %s comme suit
(taille et Offset en %s) : (taille et Offset en %s) :

4
distrib/utils/sysinst/arch/shark/Makefile
View File

@ -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 # Makefile for arm32
# #
@ -7,7 +7,7 @@
SRCS= menu_defs.c msg_defs.c main.c install.c upgrade.c \ 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 \ 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 md.o: menu_defs.h msg_defs.h

3
distrib/utils/sysinst/arch/shark/md.c
View File

@ -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. * Copyright 1997 Piermont Information Systems Inc.
@ -482,6 +482,7 @@ int md_make_bsd_partitions (void)
int int
md_update(void) md_update(void)
{ {
move_aout_libs();
endwin(); endwin();
md_copy_filesystem(); md_copy_filesystem();
md_post_newfs(); md_post_newfs();

18
distrib/utils/sysinst/arch/shark/md.h
View File

@ -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. * 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 */ /* Constants and defines */
@ -50,9 +50,6 @@
* base, etc, comp, games, man, misc, text, * base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp. * 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 * Third entry is the last extension name in the split sets for loading
* from floppy. * from floppy.
*/ */
@ -82,7 +79,7 @@ EXTERN distinfo dist_list[]
/* /*
* Disk names accepted as valid targets for a from-scratch installation. * 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[] EXTERN char *disk_names[]
#ifdef MAIN #ifdef MAIN
@ -95,14 +92,13 @@ EXTERN char *disk_names[]
* this must return 1 for a character that matches the first * this must return 1 for a character that matches the first
* characters of each member of disk_names. * 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') #define ISDISKSTART(dn) (dn == 'w' || dn == 's')
/* /*
* Machine-specific command to write a new label to a disk. * Machine-specific command to write a new label to a disk.
* For example, arm32 uses "/sbin/disklabel -w -r", just like arm32 * For example, shark uses "/sbin/disklabel -w -r".
* miniroot scripts, though this may leave a bogus incore label.
* Sun ports should probably use DISKLABEL_CMD "/sbin/disklabel -w" * Sun ports should probably use DISKLABEL_CMD "/sbin/disklabel -w"
* to get incore to ondisk inode translation for the Sun proms. * to get incore to ondisk inode translation for the Sun proms.
* If not defined, we assume the port does not support disklabels and * If not defined, we assume the port does not support disklabels and
@ -112,10 +108,12 @@ EXTERN char *disk_names[]
/* /*
* Default fileystem type for floppy disks. * Default fileystem type for floppy disks.
* On arm32, that is msdos. * On shark, that is msdos.
*/ */
EXTERN char *fdtype INIT("msdos"); EXTERN char *fdtype INIT("msdos");
#define LIB_COUNT 0
#define LIB_MOVE 1
/* /*
* prototypes for MD code. * prototypes for MD code.

9
distrib/utils/sysinst/arch/shark/msg.md.en
View File

@ -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. * Copyright 1997 Piermont Information Systems Inc.
@ -97,6 +97,13 @@ message askfspart
{The next partition is /dev/%s%c. You have %d %s left on your disk. {The next partition is /dev/%s%c. You have %d %s left on your disk.
Partition size? } 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 message arm32fspart
{We now have your NetBSD partitions on %s as follows (Size and Offset in %s): {We now have your NetBSD partitions on %s as follows (Size and Offset in %s):
} }

10
distrib/utils/sysinst/arch/shark/msg.md.fr
View File

@ -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. * Copyright 1997 Piermont Information Systems Inc.
@ -102,6 +102,14 @@ message askfspart
disque. disque.
Taille de la partition ? } 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 message arm32fspart
{Nous avons maintenant vos partitions NetBSD sur %s comme suit {Nous avons maintenant vos partitions NetBSD sur %s comme suit
(taille et Offset en %s) : (taille et Offset en %s) :