Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src/distrib/utils/sysinst Pull up the following revisions(s) ...
details: https://anonhg.NetBSD.org/src/rev/aaa3d90e1141
branches: netbsd-6
changeset: 774115:aaa3d90e1141
user: sborrill <sborrill%NetBSD.org@localhost>
date: Thu May 17 18:57:07 2012 +0000
description:
Pull up the following revisions(s) (requested by riz in ticket #247):
distrib/utils/sysinst/Makefile.inc: revision 1.59 via patch
distrib/utils/sysinst/checkrc.c: revision 1.1-1.2 via patch
distrib/utils/sysinst/configmenu.c: revision 1.1-1.5 via patch
distrib/utils/sysinst/defs.h: revision 1.162 via patch
distrib/utils/sysinst/install.c: revision 1.46 via patch
distrib/utils/sysinst/main.c: revision 1.64 via patch
distrib/utils/sysinst/mbr.c: revision 1.90 via patch
distrib/utils/sysinst/menus.mi: revision 1.45-1.46 via patch
distrib/utils/sysinst/msg.mbr.de: revision 1.12 via patch
distrib/utils/sysinst/msg.mbr.en: revision 1.16-1.17 via patch
distrib/utils/sysinst/msg.mbr.es: revision 1.7 via patch
distrib/utils/sysinst/msg.mbr.fr: revision 1.18-1.19 via patch
distrib/utils/sysinst/msg.mbr.pl: revision 1.15-1.16 via patch
distrib/utils/sysinst/msg.mi.de: revision 1.62-1.67 via patch
distrib/utils/sysinst/msg.mi.en: revision 1.170-1.172 via patch
distrib/utils/sysinst/msg.mi.es: revision 1.40-1.43 via patch
distrib/utils/sysinst/msg.mi.fr: revision 1.120-1.126 via patch
distrib/utils/sysinst/msg.mi.pl: revision 1.79-1.83 via patch
distrib/utils/sysinst/net.c: revision 1.131-1.132 via patch
distrib/utils/sysinst/run.c: revision 1.70 via patch
distrib/utils/sysinst/target.c: revision 1.55 via patch
distrib/utils/sysinst/util.c: revision 1.174-1.178 via patch
distrib/utils/sysinst/arch/evbarm/msg.md.de: revision 1.10-1.11 via patch
distrib/utils/sysinst/arch/evbmips/md.c: revision 1.10 via patch
distrib/utils/sysinst/arch/hp300/msg.md.de: revision 1.6-1.7 via patch
distrib/utils/sysinst/arch/hp300/msg.md.en: revision 1.9 via patch
distrib/utils/sysinst/arch/hp300/msg.md.es: revision 1.5 via patch
distrib/utils/sysinst/arch/hp300/msg.md.fr: revision 1.8 via patch
distrib/utils/sysinst/arch/hp300/msg.md.pl: revision 1.8 via patch
distrib/utils/sysinst/arch/i386/msg.md.en: revision 1.62-1.63 via patch
distrib/utils/sysinst/arch/i386/msg.md.es: revision 1.14 via patch
distrib/utils/sysinst/arch/i386/msg.md.de: revision 1.23
Sync sysinst with -current as of 2011-05-17
Add new post-install configuration menu for sysinst, and apply numerous
bug fixes.
diffstat:
distrib/utils/sysinst/Makefile.inc | 4 +-
distrib/utils/sysinst/arch/evbarm/msg.md.de | 6 +-
distrib/utils/sysinst/arch/evbmips/md.c | 4 +-
distrib/utils/sysinst/arch/hp300/msg.md.de | 10 +-
distrib/utils/sysinst/arch/hp300/msg.md.en | 9 +-
distrib/utils/sysinst/arch/hp300/msg.md.es | 9 +-
distrib/utils/sysinst/arch/hp300/msg.md.fr | 9 +-
distrib/utils/sysinst/arch/hp300/msg.md.pl | 9 +-
distrib/utils/sysinst/arch/i386/msg.md.de | 18 +-
distrib/utils/sysinst/arch/i386/msg.md.en | 8 +-
distrib/utils/sysinst/arch/i386/msg.md.es | 4 +-
distrib/utils/sysinst/defs.h | 48 ++++-
distrib/utils/sysinst/install.c | 7 +-
distrib/utils/sysinst/main.c | 15 +-
distrib/utils/sysinst/mbr.c | 72 ++++++-
distrib/utils/sysinst/menus.mi | 87 ++++++++-
distrib/utils/sysinst/msg.mbr.de | 10 +-
distrib/utils/sysinst/msg.mbr.en | 14 +-
distrib/utils/sysinst/msg.mbr.es | 14 +-
distrib/utils/sysinst/msg.mbr.fr | 4 +-
distrib/utils/sysinst/msg.mbr.pl | 4 +-
distrib/utils/sysinst/msg.mi.de | 141 ++++++++++----
distrib/utils/sysinst/msg.mi.en | 134 ++++++++++----
distrib/utils/sysinst/msg.mi.es | 124 +++++++++---
distrib/utils/sysinst/msg.mi.fr | 266 +++++++++++++++++----------
distrib/utils/sysinst/msg.mi.pl | 122 +++++++++---
distrib/utils/sysinst/net.c | 119 +++++++++---
distrib/utils/sysinst/run.c | 17 +-
distrib/utils/sysinst/target.c | 10 +-
distrib/utils/sysinst/util.c | 185 ++++++++++++++----
30 files changed, 1038 insertions(+), 445 deletions(-)
diffs (truncated from 3093 to 300 lines):
diff -r 215e6609e7d8 -r aaa3d90e1141 distrib/utils/sysinst/Makefile.inc
--- a/distrib/utils/sysinst/Makefile.inc Thu May 17 18:39:37 2012 +0000
+++ b/distrib/utils/sysinst/Makefile.inc Thu May 17 18:57:07 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.58 2012/01/08 21:20:40 riz Exp $
+# $NetBSD: Makefile.inc,v 1.58.2.1 2012/05/17 18:57:07 sborrill Exp $
#
# Makefile for sysinst
@@ -13,7 +13,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 sizemultname.c
+ label.c target.c md.c sizemultname.c configmenu.c checkrc.c
SRCS+= ${MD_OPTIONS:MAOUT2ELF:S/AOUT2ELF/aout2elf.c/}
SRCS+= ${MENUS_MD:Mmenus.mbr:S/menus.mbr/mbr.c/}
diff -r 215e6609e7d8 -r aaa3d90e1141 distrib/utils/sysinst/arch/evbarm/msg.md.de
--- a/distrib/utils/sysinst/arch/evbarm/msg.md.de Thu May 17 18:39:37 2012 +0000
+++ b/distrib/utils/sysinst/arch/evbarm/msg.md.de Thu May 17 18:57:07 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.9 2012/02/03 00:35:35 nisimura Exp $ */
+/* $NetBSD: msg.md.de,v 1.9.2.1 2012/05/17 18:57:12 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -51,7 +51,7 @@
}
message badreadriscix
-{Kann die RISCiX Partitionstabelle nicht lesen
+{Kann die RISCiX Partitionstabelle nicht lesen
}
message notnetbsdriscix
@@ -61,7 +61,7 @@
message notnetbsd
{Keine NetBSD Partition gefunden (eine Nur-Filecore Platte?) - erstellen eines
-Labels nicht möglich.
+Labels nicht möglich.
}
message dobootblks
diff -r 215e6609e7d8 -r aaa3d90e1141 distrib/utils/sysinst/arch/evbmips/md.c
--- a/distrib/utils/sysinst/arch/evbmips/md.c Thu May 17 18:39:37 2012 +0000
+++ b/distrib/utils/sysinst/arch/evbmips/md.c Thu May 17 18:57:07 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2011/11/04 11:27:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.9.2.1 2012/05/17 18:57:12 sborrill Exp $ */
/*
* Copyright 1997,2002 Piermont Information Systems Inc.
@@ -160,7 +160,7 @@
}
int
-md_pre_mount()
+md_pre_mount(void)
{
return 0;
}
diff -r 215e6609e7d8 -r aaa3d90e1141 distrib/utils/sysinst/arch/hp300/msg.md.de
--- a/distrib/utils/sysinst/arch/hp300/msg.md.de Thu May 17 18:39:37 2012 +0000
+++ b/distrib/utils/sysinst/arch/hp300/msg.md.de Thu May 17 18:57:07 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.5 2011/04/04 08:30:28 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.5.6.1 2012/05/17 18:57:12 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -49,14 +49,6 @@
{Installiere die Bootblöcke auf %s ...
}
-message newdisk
-{Ihre Festplatte, %s, scheint nicht als x68k Festplatte markiert zu sein;
-sysinst wird dies nun tun.
-Falls Sie planen eine Partition der Festplatte %s mit Human68k zu nutzen,
-sollten Sie hier unbedingt abbrechen und die Festplatte mit dem Human68k
-format.x Werkzeug formatieren.
-}
-
message ordering
{Die Anordnung der Partition %c ist falsch. Erneut editieren?}
diff -r 215e6609e7d8 -r aaa3d90e1141 distrib/utils/sysinst/arch/hp300/msg.md.en
--- a/distrib/utils/sysinst/arch/hp300/msg.md.en Thu May 17 18:39:37 2012 +0000
+++ b/distrib/utils/sysinst/arch/hp300/msg.md.en Thu May 17 18:57:07 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.8 2011/04/04 08:30:28 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.8.6.1 2012/05/17 18:57:13 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -48,13 +48,6 @@
{Installing boot blocks on %s....
}
-message newdisk
-{It appears that your disk, %s, has no X68K disk mark. sysinst is
-writing a disk mark.
-Note that if you plan to use a part of %s from Human68k, you should abort
-here and format the disk with Human68k format.x utility.
-}
-
message ordering
{The order of partition %c is wrong. Edit again?}
diff -r 215e6609e7d8 -r aaa3d90e1141 distrib/utils/sysinst/arch/hp300/msg.md.es
--- a/distrib/utils/sysinst/arch/hp300/msg.md.es Thu May 17 18:39:37 2012 +0000
+++ b/distrib/utils/sysinst/arch/hp300/msg.md.es Thu May 17 18:57:07 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.4 2011/04/04 08:30:28 mbalmer Exp $ */
+/* $NetBSD: msg.md.es,v 1.4.6.1 2012/05/17 18:57:13 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -48,13 +48,6 @@
{Instalando bloques de arranque en %s....
}
-message newdisk
-{Parece que su disco, %s, no tiene una marca de disco X68K. sysinst
-escribirá una marca de disco.
-Note que si pretende usar una parte de %s desde Human68k, debería abortar
-aqui y formatear el disco con la utilidad format.x de Human68k.
-}
-
message ordering
{El orden de la partición %c esta mal. ¿Editar de nuevo?}
diff -r 215e6609e7d8 -r aaa3d90e1141 distrib/utils/sysinst/arch/hp300/msg.md.fr
--- a/distrib/utils/sysinst/arch/hp300/msg.md.fr Thu May 17 18:39:37 2012 +0000
+++ b/distrib/utils/sysinst/arch/hp300/msg.md.fr Thu May 17 18:57:07 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.7 2011/04/04 08:30:28 mbalmer Exp $ */
+/* $NetBSD: msg.md.fr,v 1.7.6.1 2012/05/17 18:57:13 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -47,13 +47,6 @@
{Installation des blocs de démarrage sur %s ...
}
-message newdisk
-{Il apparaît que votre disque, %s, n'a pas de marque de disque X68K. sysinst
-écrit une marque de disque.
-Si vous comptez utiliser une partie de %s depuis Human68k, vous devriez annuler
-maintenant et formater le disque avec l'utilitaire format.x de Human68k.
-}
-
message ordering
{L'ordre de la partition %c est erroné. Modifier à nouveau ?}
diff -r 215e6609e7d8 -r aaa3d90e1141 distrib/utils/sysinst/arch/hp300/msg.md.pl
--- a/distrib/utils/sysinst/arch/hp300/msg.md.pl Thu May 17 18:39:37 2012 +0000
+++ b/distrib/utils/sysinst/arch/hp300/msg.md.pl Thu May 17 18:57:07 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.7 2011/04/04 08:30:28 mbalmer Exp $ */
+/* $NetBSD: msg.md.pl,v 1.7.6.1 2012/05/17 18:57:13 sborrill Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.2 2002/03/15 05:26:37 gmcgarry Exp */
@@ -50,13 +50,6 @@
{Instalowanie bootblokow na %s....
}
-message newdisk
-{Wyglada na to, ze twoj dysk %s, nie ma znaku X68K. sysinst wpisuje taki
-znak.
-Pamietaj, ze jesli chcesz uzywac czesci dysku %s z Human68k, powinienes
-tu przerwac i zformatowac dysk za pomoca format.x z Human68k.
-}
-
message ordering
{Uklad partycji %c jest bledny. Edytowac jeszcze raz?}
diff -r 215e6609e7d8 -r aaa3d90e1141 distrib/utils/sysinst/arch/i386/msg.md.de
--- a/distrib/utils/sysinst/arch/i386/msg.md.de Thu May 17 18:39:37 2012 +0000
+++ b/distrib/utils/sysinst/arch/i386/msg.md.de Thu May 17 18:57:07 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.20 2011/04/04 08:30:32 mbalmer Exp $ */
+/* $NetBSD: msg.md.de,v 1.20.6.1 2012/05/17 18:57:14 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -55,22 +55,22 @@
Normale Bootblöcke benutzen die BIOS Konsolenschnittstelle als Konsole
(meistens der Monitor und die Tastatur). Serielle Bootblöcke benutzen den
-ersten seriellen Anschluss als Konsole.
+gewählten seriellen Anschluss als Konsole.
Selektierter Bootblock: }
message console_PC {BIOS Konsole}
-message console_com {Serieller Anschluss com%d mit %d baud}
+message console_com {Serielle Konsole an com%d mit %d baud}
message console_unchanged {Unverändert}
message Bootblocks_selection
{Auswahl der Bootblöcke}
-message Use_normal_bootblocks {BIOS Konsole benutzen}
-message Use_serial_com0 {Serieller Anschluss com0 benutzen}
-message Use_serial_com1 {Serieller Anschluss com1 benutzen}
-message Use_serial_com2 {Serieller Anschluss com2 benutzen}
-message Use_serial_com3 {Serieller Anschluss com3 benutzen}
-message serial_baud_rate {Serielle baud Rate}
+message Use_normal_bootblocks {BIOS Konsole}
+message Use_serial_com0 {Serielle Konsole an com0}
+message Use_serial_com1 {Serielle Konsole an com1}
+message Use_serial_com2 {Serielle Konsole an com2}
+message Use_serial_com3 {Serielle Konsole an com3}
+message serial_baud_rate {Serielle Geschwindigkeit wählen...}
message Use_existing_bootblocks {Vorhandene Bootblöcke benutzen}
message dobootblks
diff -r 215e6609e7d8 -r aaa3d90e1141 distrib/utils/sysinst/arch/i386/msg.md.en
--- a/distrib/utils/sysinst/arch/i386/msg.md.en Thu May 17 18:39:37 2012 +0000
+++ b/distrib/utils/sysinst/arch/i386/msg.md.en Thu May 17 18:57:07 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.61 2011/04/04 08:30:32 mbalmer Exp $ */
+/* $NetBSD: msg.md.en,v 1.61.6.1 2012/05/17 18:57:14 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -115,7 +115,7 @@
Note: since sysinst was able to uniquely match the disk you chose with a disk
known to the BIOS, the values displayed above are very likely correct, and
should not be changed (the values for cylinders, heads and sectors are
-probably 1023, 255 and 63 - this is correct).
+probably 1023, 255 and 63 - this is correct).
You should only change the geometry if you know the BIOS reports incorrect
values.
}
@@ -126,7 +126,7 @@
message partabovechs
{The NetBSD part of the disk lies outside of the range that the BIOS on
your machine can address.
-Booting from it may not be possible.
+Booting from it may not be possible.
Are you sure you that you want to do this?
(Answering 'no' will take you back to the partition edit menu.)}
@@ -141,7 +141,7 @@
message no_extended_bootmenu
{You have requested that an extended partition be included in the bootmenu.
However your system BIOS doesn't appear to support the read command used
-by that version of the bootmenu code.
+by that version of the bootmenu code.
Are you sure you that you want to do this?
(Answering 'no' will take you back to the partition edit menu.)}
diff -r 215e6609e7d8 -r aaa3d90e1141 distrib/utils/sysinst/arch/i386/msg.md.es
--- a/distrib/utils/sysinst/arch/i386/msg.md.es Thu May 17 18:39:37 2012 +0000
+++ b/distrib/utils/sysinst/arch/i386/msg.md.es Thu May 17 18:57:07 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.13 2011/04/04 08:30:32 mbalmer Exp $ */
+/* $NetBSD: msg.md.es,v 1.13.6.1 2012/05/17 18:57:14 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -51,7 +51,7 @@
message getboottype
{¿Le gustaria instalar el set normal de bootblocks o bootblocks por serie?
-
+
Bootblocks normal usa el dispositivo de consola de BIOS como consola
(normalmente el monitor y teclado). Bootblocks por serie usa el primer
puerto serie como consola.
diff -r 215e6609e7d8 -r aaa3d90e1141 distrib/utils/sysinst/defs.h
--- a/distrib/utils/sysinst/defs.h Thu May 17 18:39:37 2012 +0000
+++ b/distrib/utils/sysinst/defs.h Thu May 17 18:57:07 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.161 2012/01/10 21:02:47 gson Exp $ */
+/* $NetBSD: defs.h,v 1.161.2.1 2012/05/17 18:57:08 sborrill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -133,6 +133,7 @@
SET_LAST,
SET_GROUP, /* Start of submenu */
SET_GROUP_END, /* End of submenu */
+ SET_PKGSRC, /* pkgsrc, not counted as regular set */
};
/* Initialisers to select sets */
@@ -288,26 +289,50 @@
#define SYSINST_FTP_DIR "pub/NetBSD/NetBSD-" REL
#endif
+#if !defined(SYSINST_PKG_HOST)
+#define SYSINST_PKG_HOST SYSINST_FTP_HOST
+#endif
+
+#if !defined(SYSINST_PKG_DIR)
+#define SYSINST_PKG_DIR "pub/pkgsrc/packages/NetBSD"
Home |
Main Index |
Thread Index |
Old Index