Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/utils/sysinst extend sysinst disk handling, some gen...
details: https://anonhg.NetBSD.org/src/rev/0b9d611ee045
branches: trunk
changeset: 502228:0b9d611ee045
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Jan 14 02:38:13 2001 +0000
description:
extend sysinst disk handling, some general clean ups, better /etc support
and some sparc64 fixes. details:
- new scripting_{,v}fprintf() that also write to the script log (if open).
- support of creation of LFS filesystems
- standard installs now allow one to choose which file systems to create,
out of the list of /usr, /var, /home, MFS /tmp, and swap. a / is always
created, but the rest all optional. [*]
- new disklabel method: use existing. this requires one to fill in the
mount points (and having at least a "/" is enforced).
- preservation of existing filesystems (at install) is supported.
- rewrote most of make_fstab(): the entire thing is generated from the
bsdlabel now, rather than hard coding / to 'a' and swap to 'b'. create
MFS /tmp if requested.
- if IPv6 support isn't present, don't display any ipv6 messages.
- better rc.conf support
- sparc & sparc64 default to "cylinders" now.
- choosing "standard" instead of "standard with X" de-selects the X pkgs
by default.
- sparc64: don't install bootblocks until we have a complete system, avoids
booting with no /dev/console.
- sparc64: bump STDNEEDMB, it is way low.
[*] i have added default values for DEFVARSIZE & DEFUSRSIZE (this is used
only if /usr and /home are selected) to each port, based on STDNEEDMB. as
such, my guesses might be wrong so port maintainers should look at these.
diffstat:
distrib/utils/sysinst/arch/alpha/Makefile | 4 +-
distrib/utils/sysinst/arch/alpha/md.c | 19 ++-
distrib/utils/sysinst/arch/amiga/Makefile | 4 +-
distrib/utils/sysinst/arch/amiga/md.c | 26 ++-
distrib/utils/sysinst/arch/arm32/Makefile | 4 +-
distrib/utils/sysinst/arch/arm32/md.c | 26 ++-
distrib/utils/sysinst/arch/bebox/Makefile | 4 +-
distrib/utils/sysinst/arch/bebox/md.c | 26 ++-
distrib/utils/sysinst/arch/hpcmips/Makefile | 4 +-
distrib/utils/sysinst/arch/hpcmips/md.c | 26 ++-
distrib/utils/sysinst/arch/i386/Makefile | 4 +-
distrib/utils/sysinst/arch/i386/md.c | 39 +++--
distrib/utils/sysinst/arch/mac68k/Makefile | 4 +-
distrib/utils/sysinst/arch/mac68k/md.c | 26 ++-
distrib/utils/sysinst/arch/macppc/Makefile | 4 +-
distrib/utils/sysinst/arch/macppc/md.c | 21 ++-
distrib/utils/sysinst/arch/news68k/Makefile | 4 +-
distrib/utils/sysinst/arch/news68k/md.c | 21 ++-
distrib/utils/sysinst/arch/pc532/Makefile | 4 +-
distrib/utils/sysinst/arch/pc532/md.c | 19 +-
distrib/utils/sysinst/arch/pmax/Makefile | 4 +-
distrib/utils/sysinst/arch/pmax/md.c | 26 ++-
distrib/utils/sysinst/arch/pmax/md.h | 4 +-
distrib/utils/sysinst/arch/sparc/Makefile | 4 +-
distrib/utils/sysinst/arch/sparc/md.c | 29 +++-
distrib/utils/sysinst/arch/sparc/md.h | 4 +-
distrib/utils/sysinst/arch/sparc64/Makefile | 4 +-
distrib/utils/sysinst/arch/sparc64/md.c | 48 ++++--
distrib/utils/sysinst/arch/sparc64/md.h | 8 +-
distrib/utils/sysinst/arch/vax/Makefile | 4 +-
distrib/utils/sysinst/arch/vax/md.c | 26 ++-
distrib/utils/sysinst/arch/vax/md.h | 4 +-
distrib/utils/sysinst/arch/x68k/Makefile | 4 +-
distrib/utils/sysinst/arch/x68k/md.c | 26 ++-
distrib/utils/sysinst/arch/x68k/md.h | 4 +-
distrib/utils/sysinst/bsddisklabel.c | 197 ++++++++++++++++++++++++---
distrib/utils/sysinst/defs.h | 25 +++-
distrib/utils/sysinst/disks.c | 127 ++++++++++-------
distrib/utils/sysinst/disks_lfs.c | 46 ++++++
distrib/utils/sysinst/geom.c | 26 +++-
distrib/utils/sysinst/label.c | 55 ++-----
distrib/utils/sysinst/menus.mi.en | 57 +++++++-
distrib/utils/sysinst/menus.mi.fr | 28 +++-
distrib/utils/sysinst/msg.mi.en | 48 +++++-
distrib/utils/sysinst/msg.mi.fr | 43 +++++-
distrib/utils/sysinst/net.c | 144 +++++--------------
distrib/utils/sysinst/run.c | 8 +-
distrib/utils/sysinst/target.c | 9 +-
distrib/utils/sysinst/upgrade.c | 3 +-
distrib/utils/sysinst/util.c | 90 ++++++++++++-
50 files changed, 1000 insertions(+), 394 deletions(-)
diffs (truncated from 2692 to 300 lines):
diff -r 6db9c06f3d0f -r 0b9d611ee045 distrib/utils/sysinst/arch/alpha/Makefile
--- a/distrib/utils/sysinst/arch/alpha/Makefile Sun Jan 14 02:22:29 2001 +0000
+++ b/distrib/utils/sysinst/arch/alpha/Makefile Sun Jan 14 02:38:13 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/01/31 22:28:33 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2001/01/14 02:38:16 mrg Exp $
#
# Makefile for alpha
#
@@ -6,7 +6,7 @@
# have to have all of them here for crunch ...
SRCS= menu_defs.c msg_defs.c main.c install.c upgrade.c \
- txtwalk.c run.c factor.c net.c disks.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
md.o: menu_defs.h msg_defs.h
diff -r 6db9c06f3d0f -r 0b9d611ee045 distrib/utils/sysinst/arch/alpha/md.c
--- a/distrib/utils/sysinst/arch/alpha/md.c Sun Jan 14 02:22:29 2001 +0000
+++ b/distrib/utils/sysinst/arch/alpha/md.c Sun Jan 14 02:38:13 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.25 2001/01/07 13:07:57 jdc Exp $ */
+/* $NetBSD: md.c,v 1.26 2001/01/14 02:38:16 mrg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -361,3 +361,20 @@
md_init()
{
}
+
+void
+md_set_sizemultname()
+{
+
+ set_sizemultname_meg();
+}
+
+void
+md_set_no_x()
+{
+ toggle_getit (8);
+ toggle_getit (9);
+ toggle_getit (10);
+ toggle_getit (11);
+ toggle_getit (12);
+}
diff -r 6db9c06f3d0f -r 0b9d611ee045 distrib/utils/sysinst/arch/amiga/Makefile
--- a/distrib/utils/sysinst/arch/amiga/Makefile Sun Jan 14 02:22:29 2001 +0000
+++ b/distrib/utils/sysinst/arch/amiga/Makefile Sun Jan 14 02:38:13 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2000/02/20 20:34:57 is Exp $
+# $NetBSD: Makefile,v 1.2 2001/01/14 02:38:17 mrg Exp $
#
# Makefile for i386
#
@@ -6,7 +6,7 @@
# have to have all of them here for crunch ...
SRCS= menu_defs.c msg_defs.c main.c install.c upgrade.c \
- txtwalk.c run.c factor.c net.c disks.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
fdisk.o md.o: menu_defs.h msg_defs.h
diff -r 6db9c06f3d0f -r 0b9d611ee045 distrib/utils/sysinst/arch/amiga/md.c
--- a/distrib/utils/sysinst/arch/amiga/md.c Sun Jan 14 02:22:29 2001 +0000
+++ b/distrib/utils/sysinst/arch/amiga/md.c Sun Jan 14 02:38:13 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.7 2001/01/07 13:07:58 jdc Exp $ */
+/* $NetBSD: md.c,v 1.8 2001/01/14 02:38:17 mrg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -127,10 +127,7 @@
sprintf(sedcmd, "sed 's/rc_configured=NO/rc_configured=YES/' < %s > %s",
realfrom, realto);
- if (logging)
- (void)fprintf(log, "%s\n", sedcmd);
- if (scripting)
- (void)fprintf(script, "%s\n", sedcmd);
+ scripting_fprintf(log, "%s\n", sedcmd);
do_system(sedcmd);
run_prog(RUN_FATAL, NULL, "mv -f %s %s", realto, realfrom);
@@ -149,3 +146,22 @@
md_init()
{
}
+
+void
+md_set_sizemultname()
+{
+
+ set_sizemultname_meg();
+}
+
+void
+md_set_no_x()
+{
+
+ toggle_getit (8);
+ toggle_getit (9);
+ toggle_getit (10);
+ toggle_getit (11);
+ toggle_getit (12);
+ toggle_getit (13);
+}
diff -r 6db9c06f3d0f -r 0b9d611ee045 distrib/utils/sysinst/arch/arm32/Makefile
--- a/distrib/utils/sysinst/arch/arm32/Makefile Sun Jan 14 02:22:29 2001 +0000
+++ b/distrib/utils/sysinst/arch/arm32/Makefile Sun Jan 14 02:38:13 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1997/12/04 11:28:04 jonathan Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/14 02:38:17 mrg Exp $
#
# Makefile for arm32
#
@@ -6,7 +6,7 @@
# have to have all of them here for crunch ...
SRCS= menu_defs.c msg_defs.c main.c install.c upgrade.c \
- txtwalk.c run.c factor.c net.c disks.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
md.o: menu_defs.h msg_defs.h
diff -r 6db9c06f3d0f -r 0b9d611ee045 distrib/utils/sysinst/arch/arm32/md.c
--- a/distrib/utils/sysinst/arch/arm32/md.c Sun Jan 14 02:22:29 2001 +0000
+++ b/distrib/utils/sysinst/arch/arm32/md.c Sun Jan 14 02:38:13 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.29 2001/01/07 13:07:58 jdc Exp $ */
+/* $NetBSD: md.c,v 1.30 2001/01/14 02:38:17 mrg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -505,10 +505,7 @@
sprintf(sedcmd, "sed 's/rc_configured=NO/rc_configured=YES/' < %s > %s",
realfrom, realto);
- if (logging)
- (void)fprintf(log, "%s\n", sedcmd);
- if (scripting)
- (void)fprintf(script, "%s\n", sedcmd);
+ scripting_fprintf(log, "%s\n", sedcmd);
do_system(sedcmd);
run_prog(RUN_FATAL, NULL, "mv -f %s %s", realto, realfrom);
run_prog(0, NULL, "rm -f %s", target_expand("/sysinst"));
@@ -527,3 +524,22 @@
md_init()
{
}
+
+void
+md_set_sizemultname()
+{
+
+ set_sizemultname_meg();
+}
+
+void
+md_set_no_x()
+{
+
+ toggle_getit (8);
+ toggle_getit (9);
+ toggle_getit (10);
+ toggle_getit (11);
+ toggle_getit (12);
+ toggle_getit (13);
+}
diff -r 6db9c06f3d0f -r 0b9d611ee045 distrib/utils/sysinst/arch/bebox/Makefile
--- a/distrib/utils/sysinst/arch/bebox/Makefile Sun Jan 14 02:22:29 2001 +0000
+++ b/distrib/utils/sysinst/arch/bebox/Makefile Sun Jan 14 02:38:13 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/03/31 00:44:49 fvdl Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/14 02:38:18 mrg Exp $
#
# Makefile for bebox
#
@@ -6,7 +6,7 @@
# have to have all of them here for crunch ...
SRCS= menu_defs.c msg_defs.c main.c install.c upgrade.c \
- txtwalk.c run.c factor.c net.c disks.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 mbr.c
fdisk.o md.o: menu_defs.h msg_defs.h
diff -r 6db9c06f3d0f -r 0b9d611ee045 distrib/utils/sysinst/arch/bebox/md.c
--- a/distrib/utils/sysinst/arch/bebox/md.c Sun Jan 14 02:22:29 2001 +0000
+++ b/distrib/utils/sysinst/arch/bebox/md.c Sun Jan 14 02:38:13 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.21 2001/01/07 13:07:58 jdc Exp $ */
+/* $NetBSD: md.c,v 1.22 2001/01/14 02:38:18 mrg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -352,10 +352,7 @@
strncpy(realto, target_expand("/etc/rc.conf.install"), STRSIZE);
sprintf(sedcmd, "sed 's/rc_configured=NO/rc_configured=YES/' < %s > %s",
realfrom, realto);
- if (logging)
- (void)fprintf(log, "%s\n", sedcmd);
- if (scripting)
- (void)fprintf(script, "%s\n", sedcmd);
+ scripting_fprintf(log, "%s\n", sedcmd);
do_system(sedcmd);
run_prog(RUN_FATAL, NULL, "mv -f %s %s", realto, realfrom);
@@ -374,3 +371,22 @@
md_init()
{
}
+
+void
+md_set_sizemultname()
+{
+
+ set_sizemultname_meg();
+}
+
+void
+md_set_no_x()
+{
+
+ toggle_getit (8);
+ toggle_getit (9);
+ toggle_getit (10);
+ toggle_getit (11);
+ toggle_getit (12);
+ toggle_getit (13);
+}
diff -r 6db9c06f3d0f -r 0b9d611ee045 distrib/utils/sysinst/arch/hpcmips/Makefile
--- a/distrib/utils/sysinst/arch/hpcmips/Makefile Sun Jan 14 02:22:29 2001 +0000
+++ b/distrib/utils/sysinst/arch/hpcmips/Makefile Sun Jan 14 02:38:13 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/02/28 05:17:50 jun Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/14 02:38:18 mrg Exp $
#
# Makefile for i386
#
@@ -6,7 +6,7 @@
# have to have all of them here for crunch ...
SRCS= menu_defs.c msg_defs.c main.c install.c upgrade.c \
- txtwalk.c run.c factor.c net.c disks.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 mbr.c mbr_buf.s
fdisk.o md.o: menu_defs.h msg_defs.h
diff -r 6db9c06f3d0f -r 0b9d611ee045 distrib/utils/sysinst/arch/hpcmips/md.c
--- a/distrib/utils/sysinst/arch/hpcmips/md.c Sun Jan 14 02:22:29 2001 +0000
+++ b/distrib/utils/sysinst/arch/hpcmips/md.c Sun Jan 14 02:38:13 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.11 2001/01/07 13:07:58 jdc Exp $ */
+/* $NetBSD: md.c,v 1.12 2001/01/14 02:38:18 mrg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -508,10 +508,7 @@
sprintf(sedcmd, "sed 's/rc_configured=NO/rc_configured=YES/' < %s > %s",
realfrom, realto);
- if (logging)
- (void)fprintf(log, "%s\n", sedcmd);
- if (scripting)
- (void)fprintf(script, "%s\n", sedcmd);
+ scripting_fprintf(log, "%s\n", sedcmd);
do_system(sedcmd);
run_prog(RUN_FATAL, NULL, "mv -f %s %s", realto, realfrom);
@@ -664,3 +661,22 @@
md_init()
{
}
+
+void
+md_set_sizemultname()
+{
+
+ set_sizemultname_meg();
+}
+
+void
+md_set_no_x()
+{
+
+ toggle_getit (8);
+ toggle_getit (9);
+ toggle_getit (10);
+ toggle_getit (11);
+ toggle_getit (12);
+ toggle_getit (13);
+}
diff -r 6db9c06f3d0f -r 0b9d611ee045 distrib/utils/sysinst/arch/i386/Makefile
--- a/distrib/utils/sysinst/arch/i386/Makefile Sun Jan 14 02:22:29 2001 +0000
+++ b/distrib/utils/sysinst/arch/i386/Makefile Sun Jan 14 02:38:13 2001 +0000
@@ -1,4 +1,4 @@
Home |
Main Index |
Thread Index |
Old Index