diff --git a/distrib/utils/sysinst/arch/acorn26/Makefile b/distrib/utils/sysinst/arch/acorn26/Makefile
index 6d583aa22736..6a71eef6bd54 100644
--- a/distrib/utils/sysinst/arch/acorn26/Makefile
+++ b/distrib/utils/sysinst/arch/acorn26/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2002/05/02 23:02:50 bjh21 Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:07 christos 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 aout2elf.c
+	label.c target.c md.c aout2elf.c savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/acorn26/md.c b/distrib/utils/sysinst/arch/acorn26/md.c
index d25c4768ef10..f6cf4c56ca6b 100644
--- a/distrib/utils/sysinst/arch/acorn26/md.c
+++ b/distrib/utils/sysinst/arch/acorn26/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.4 2002/12/05 01:17:19 fvdl Exp $	*/
+/*	$NetBSD: md.c,v 1.5 2003/01/11 19:44:07 christos Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -46,6 +46,7 @@
 #include <util.h>
 #include <sys/types.h>
 #include <sys/disklabel.h>
+#include <sys/disklabel_acorn.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include "defs.h"
diff --git a/distrib/utils/sysinst/arch/acorn32/Makefile b/distrib/utils/sysinst/arch/acorn32/Makefile
index 7d423db42d45..d7045cd03290 100644
--- a/distrib/utils/sysinst/arch/acorn32/Makefile
+++ b/distrib/utils/sysinst/arch/acorn32/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2002/04/02 17:11:20 thorpej Exp $
+#	$NetBSD: Makefile,v 1.4 2003/01/11 19:44:07 christos 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 aout2elf.c
+	label.c target.c md.c aout2elf.c savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/acorn32/md.c b/distrib/utils/sysinst/arch/acorn32/md.c
index f337171bf78e..2efd82322585 100644
--- a/distrib/utils/sysinst/arch/acorn32/md.c
+++ b/distrib/utils/sysinst/arch/acorn32/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.5 2002/12/05 01:17:20 fvdl Exp $	*/
+/*	$NetBSD: md.c,v 1.6 2003/01/11 19:44:07 christos Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -46,6 +46,7 @@
 #include <util.h>
 #include <sys/types.h>
 #include <sys/disklabel.h>
+#include <sys/disklabel_acorn.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include "defs.h"
diff --git a/distrib/utils/sysinst/arch/alpha/Makefile b/distrib/utils/sysinst/arch/alpha/Makefile
index aa0a7ac1022e..86e4d5275b5d 100644
--- a/distrib/utils/sysinst/arch/alpha/Makefile
+++ b/distrib/utils/sysinst/arch/alpha/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2001/01/14 02:38:16 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2003/01/11 19:44:08 christos Exp $
 #
 # Makefile for alpha
 #
@@ -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 savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/amiga/Makefile b/distrib/utils/sysinst/arch/amiga/Makefile
index 60f41eb4cc83..f88c04422d39 100644
--- a/distrib/utils/sysinst/arch/amiga/Makefile
+++ b/distrib/utils/sysinst/arch/amiga/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2001/01/14 02:38:17 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2003/01/11 19:44:08 christos Exp $
 #
 # Makefile for i386
 #
@@ -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 sizemultname.c
 
 fdisk.o md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/arc/Makefile b/distrib/utils/sysinst/arch/arc/Makefile
index 0e8d053b9927..d958dc105aa9 100644
--- a/distrib/utils/sysinst/arch/arc/Makefile
+++ b/distrib/utils/sysinst/arch/arc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2002/10/17 02:05:37 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2003/01/11 19:44:08 christos Exp $
 #
 # Makefile for arc
 #
@@ -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 mbr.c
+	label.c target.c md.c mbr.c sizemultname.c
 
 fdisk.o md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/atari/Makefile b/distrib/utils/sysinst/arch/atari/Makefile
index acb5a9deb978..b34089ce5807 100644
--- a/distrib/utils/sysinst/arch/atari/Makefile
+++ b/distrib/utils/sysinst/arch/atari/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2002/04/25 20:16:08 leo Exp $
+#	$NetBSD: Makefile,v 1.4 2003/01/11 19:44:08 christos Exp $
 #
 # Makefile for atari
 #
@@ -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 aout2elf.c
+	label.c target.c md.c aout2elf.c savenewlabel.c sizemultname.c
 
 fdisk.o md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/bebox/Makefile b/distrib/utils/sysinst/arch/bebox/Makefile
index 5a8c329c4d23..f7c86155fe53 100644
--- a/distrib/utils/sysinst/arch/bebox/Makefile
+++ b/distrib/utils/sysinst/arch/bebox/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2001/01/14 02:38:18 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2003/01/11 19:44:09 christos Exp $
 #
 # Makefile for bebox
 #
@@ -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 mbr.c
+	label.c target.c md.c mbr.c sizemultname.c
 
 fdisk.o md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/cats/Makefile b/distrib/utils/sysinst/arch/cats/Makefile
index 8a345a7befb5..7021fb9b7cdf 100644
--- a/distrib/utils/sysinst/arch/cats/Makefile
+++ b/distrib/utils/sysinst/arch/cats/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2002/04/11 16:34:00 skrll Exp $
+#	$NetBSD: Makefile,v 1.3 2003/01/11 19:44:09 christos Exp $
 #
 # Makefile for cats
 #
@@ -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 savenewlabel.c sizemultname.c
 SRCS+=	aout2elf.c
 
 md.o:	menu_defs.h msg_defs.h
diff --git a/distrib/utils/sysinst/arch/evbarm/Makefile b/distrib/utils/sysinst/arch/evbarm/Makefile
index c92151982d93..fdaefb687efd 100644
--- a/distrib/utils/sysinst/arch/evbarm/Makefile
+++ b/distrib/utils/sysinst/arch/evbarm/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2002/04/13 01:47:52 thorpej Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:10 christos Exp $
 #
 # Makefile for evbarm
 #
@@ -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 aout2elf.c
+	label.c target.c md.c aout2elf.c savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/evbppc/Makefile b/distrib/utils/sysinst/arch/evbppc/Makefile
index 5d7a9a28b964..92a6dbb74eab 100644
--- a/distrib/utils/sysinst/arch/evbppc/Makefile
+++ b/distrib/utils/sysinst/arch/evbppc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2002/12/09 14:13:13 scw Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:10 christos Exp $
 #
 # Makefile for evbppc (walnut-specific at this time)
 #
@@ -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 mbr.c
+	label.c target.c md.c mbr.c sizemultname.c
 
 fdisk.o md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/hp300/Makefile b/distrib/utils/sysinst/arch/hp300/Makefile
index 733cb1a61f18..fdee5678a070 100644
--- a/distrib/utils/sysinst/arch/hp300/Makefile
+++ b/distrib/utils/sysinst/arch/hp300/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2002/02/10 01:14:05 gmcgarry Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:10 christos Exp $
 #
 # Makefile for hp300
 #
@@ -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 savenewlabel.c sizemultname.c
 
 fdisk.o md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/macppc/Makefile b/distrib/utils/sysinst/arch/macppc/Makefile
index 27198b6b623a..4283103d7e06 100644
--- a/distrib/utils/sysinst/arch/macppc/Makefile
+++ b/distrib/utils/sysinst/arch/macppc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2002/10/17 02:05:38 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2003/01/11 19:44:11 christos Exp $
 #
 # Makefile for macppc
 #
@@ -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 savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/mipsco/Makefile b/distrib/utils/sysinst/arch/mipsco/Makefile
index 8730941956d1..1425776c0cfb 100644
--- a/distrib/utils/sysinst/arch/mipsco/Makefile
+++ b/distrib/utils/sysinst/arch/mipsco/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2001/02/19 07:38:44 wdk Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:11 christos Exp $
 #
 # Makefile for mipsco
 #
@@ -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 savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/mvme68k/Makefile b/distrib/utils/sysinst/arch/mvme68k/Makefile
index 509af9141aed..3215d1a9abb1 100644
--- a/distrib/utils/sysinst/arch/mvme68k/Makefile
+++ b/distrib/utils/sysinst/arch/mvme68k/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2002/03/24 22:04:04 scw Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:11 christos Exp $
 #
 # Makefile for mvme68k
 #
@@ -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 savenewlabel.c sizemultname.c
 
 fdisk.o md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/news68k/Makefile b/distrib/utils/sysinst/arch/news68k/Makefile
index 2e66fb4f570b..546247fc50c2 100644
--- a/distrib/utils/sysinst/arch/news68k/Makefile
+++ b/distrib/utils/sysinst/arch/news68k/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2002/03/16 17:26:55 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.4 2003/01/11 19:44:12 christos Exp $
 #
 # Makefile for news68k
 #
@@ -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 savenewlabel.c sizemultname.c
 SRCS+=	aout2elf.c
 
 md.o:	menu_defs.h msg_defs.h
diff --git a/distrib/utils/sysinst/arch/newsmips/Makefile b/distrib/utils/sysinst/arch/newsmips/Makefile
index db8b6d44a11b..6dd01a029c1c 100644
--- a/distrib/utils/sysinst/arch/newsmips/Makefile
+++ b/distrib/utils/sysinst/arch/newsmips/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2002/03/16 15:47:56 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:12 christos Exp $
 #
 # Makefile for newsmips
 #
@@ -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 savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/pc532/Makefile b/distrib/utils/sysinst/arch/pc532/Makefile
index 33b4d645ccc5..15e3e61e00f5 100644
--- a/distrib/utils/sysinst/arch/pc532/Makefile
+++ b/distrib/utils/sysinst/arch/pc532/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2001/01/14 02:38:21 mrg Exp $
+#	$NetBSD: Makefile,v 1.8 2003/01/11 19:44:12 christos Exp $
 #
 # Makefile for pc532
 #
@@ -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 savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/pmax/Makefile b/distrib/utils/sysinst/arch/pmax/Makefile
index 7cecba288220..6f8716f76b2c 100644
--- a/distrib/utils/sysinst/arch/pmax/Makefile
+++ b/distrib/utils/sysinst/arch/pmax/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2001/01/14 02:38:21 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2003/01/11 19:44:12 christos Exp $
 #
 # Makefile for pmax
 #
@@ -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 savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/prep/Makefile b/distrib/utils/sysinst/arch/prep/Makefile
index e67954511362..a823b3cb1eec 100644
--- a/distrib/utils/sysinst/arch/prep/Makefile
+++ b/distrib/utils/sysinst/arch/prep/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2001/01/16 16:54:01 nonaka Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:13 christos Exp $
 #
 # Makefile for prep
 #
@@ -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 mbr.c
+	label.c target.c md.c mbr.c sizemultname.c
 
 fdisk.o md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/sandpoint/Makefile b/distrib/utils/sysinst/arch/sandpoint/Makefile
index 5462a16ae42c..752ff0af3829 100644
--- a/distrib/utils/sysinst/arch/sandpoint/Makefile
+++ b/distrib/utils/sysinst/arch/sandpoint/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2001/10/24 19:43:40 briggs Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:13 christos Exp $
 #
 # Makefile for bebox
 #
@@ -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 mbr.c
+	label.c target.c md.c mbr.c sizemultname.c
 
 fdisk.o md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/sgimips/Makefile b/distrib/utils/sysinst/arch/sgimips/Makefile
index a9a317715692..169e7ab9a422 100644
--- a/distrib/utils/sysinst/arch/sgimips/Makefile
+++ b/distrib/utils/sysinst/arch/sgimips/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2001/11/20 15:53:22 soren Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:13 christos Exp $
 #
 # Makefile for sgimips
 #
@@ -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 savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/shark/Makefile b/distrib/utils/sysinst/arch/shark/Makefile
index d0c9978e129f..d58e4f404ad2 100644
--- a/distrib/utils/sysinst/arch/shark/Makefile
+++ b/distrib/utils/sysinst/arch/shark/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2002/04/02 17:02:54 thorpej Exp $
+#	$NetBSD: Makefile,v 1.3 2003/01/11 19:44:14 christos 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 aout2elf.c
+	label.c target.c md.c aout2elf.c savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/sparc/Makefile b/distrib/utils/sysinst/arch/sparc/Makefile
index 1071eae7200a..ae650aa1eee5 100644
--- a/distrib/utils/sysinst/arch/sparc/Makefile
+++ b/distrib/utils/sysinst/arch/sparc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2002/02/03 22:21:56 skrll Exp $
+#	$NetBSD: Makefile,v 1.4 2003/01/11 19:44:14 christos Exp $
 #
 # Makefile for sparc
 #
@@ -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 aout2elf.c
+	label.c target.c md.c aout2elf.c savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/sparc64/Makefile b/distrib/utils/sysinst/arch/sparc64/Makefile
index fdca541fe3a2..24072be925f0 100644
--- a/distrib/utils/sysinst/arch/sparc64/Makefile
+++ b/distrib/utils/sysinst/arch/sparc64/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2001/01/14 02:38:22 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2003/01/11 19:44:14 christos Exp $
 #
 # Makefile for sparc64
 #
@@ -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 savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/vax/Makefile b/distrib/utils/sysinst/arch/vax/Makefile
index 8649f1602bca..1b5d53b3ec80 100644
--- a/distrib/utils/sysinst/arch/vax/Makefile
+++ b/distrib/utils/sysinst/arch/vax/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2002/03/30 21:55:11 matt Exp $
+#	$NetBSD: Makefile,v 1.4 2003/01/11 19:44:15 christos 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 aout2elf.c
+	label.c target.c md.c aout2elf.c savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/x68k/Makefile b/distrib/utils/sysinst/arch/x68k/Makefile
index e383fe1521c8..493d2386e9e1 100644
--- a/distrib/utils/sysinst/arch/x68k/Makefile
+++ b/distrib/utils/sysinst/arch/x68k/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2002/10/17 02:05:39 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2003/01/11 19:44:15 christos Exp $
 #
 # Makefile for x68k
 #
@@ -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 savenewlabel.c sizemultname.c
 
 md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/arch/x86_64/Makefile b/distrib/utils/sysinst/arch/x86_64/Makefile
index 16865ccaf149..caef812370ef 100644
--- a/distrib/utils/sysinst/arch/x86_64/Makefile
+++ b/distrib/utils/sysinst/arch/x86_64/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2002/12/05 02:05:56 fvdl Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/11 19:44:16 christos Exp $
 #
 # Makefile for x86_64
 #
@@ -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 mbr.c aout2elf.c
+	label.c target.c md.c mbr.c aout2elf.c sizemultname.c
 
 fdisk.o md.o:	menu_defs.h msg_defs.h
 
diff --git a/distrib/utils/sysinst/label.c b/distrib/utils/sysinst/label.c
index 1f8681e69868..5a8b0222439f 100644
--- a/distrib/utils/sysinst/label.c
+++ b/distrib/utils/sysinst/label.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: label.c,v 1.24 2003/01/10 20:00:28 christos Exp $	*/
+/*	$NetBSD: label.c,v 1.25 2003/01/11 19:44:04 christos Exp $	*/
 
 /*
  * Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.24 2003/01/10 20:00:28 christos Exp $");
+__RCSID("$NetBSD: label.c,v 1.25 2003/01/11 19:44:04 christos Exp $");
 #endif
 
 #include <sys/types.h>
@@ -198,61 +198,6 @@ emptylabel(lp)
 	}
 }
 
-#ifdef notdef
-int
-/*ARGSUSED*/
-savenewlabel(lp, nparts)
-	partinfo *lp;
-	int nparts;
-{
-	FILE *f;
-	int i;
-
-#ifdef DEBUG
-	f = fopen("/tmp/disktab", "a");
-#else
-	/* Create the disktab.preinstall */
-	f = fopen("/etc/disktab", "w");
-#endif
-	if (logging)
-		(void)fprintf(logfp, "Creating disklabel %s\n", bsddiskname);
-	scripting_fprintf(NULL, "cat <<EOF >>/etc/disktab\n");
-	if (f == NULL) {
-		endwin();
-		(void)fprintf(stderr, "Could not open /etc/disktab");
-		if (logging)
-			(void)fprintf(logfp,
-			    "Failed to open /etc/diskabel for appending.\n");
-		exit (1);
-	}
-	scripting_fprintf(f, "%s|NetBSD installation generated:\\\n", bsddiskname);
-	scripting_fprintf(f, "\t:dt=%s:ty=winchester:\\\n", disktype);
-	scripting_fprintf(f, "\t:nc#%d:nt#%d:ns#%d:\\\n", dlcyl, dlhead, dlsec);
-	scripting_fprintf(f, "\t:sc#%d:su#%d:\\\n", dlhead*dlsec, dlsize);
-	scripting_fprintf(f, "\t:se#%d:%s\\\n", sectorsize, doessf);
-	for (i = 0; i < nparts; i++) {
-		scripting_fprintf(f, "\t:p%c#%d:o%c#%d:t%c=%s:",
-		    'a'+i, bsdlabel[i].pi_size,
-		    'a'+i, bsdlabel[i].pi_offset,
-		    'a'+i, fstypenames[bsdlabel[i].pi_fstype]);
-		if (PI_ISBSDFS(&bsdlabel[i]))
-			scripting_fprintf (f, "b%c#%d:f%c#%d:ta=4.2BSD:",
-				       'a'+i, bsdlabel[i].pi_bsize,
-				       'a'+i, bsdlabel[i].pi_fsize);
-	
-		if (i < nparts - 1)
-			scripting_fprintf(f, "\\\n");
-		else
-			scripting_fprintf(f, "\n");
-	}
-	fclose (f);
-	scripting_fprintf(NULL, "EOF\n");
-	fflush(NULL);
-	return(0);
-}
-#endif
-
-
 /*
  * XXX MSDOS?
  */
diff --git a/distrib/utils/sysinst/savenewlabel.c b/distrib/utils/sysinst/savenewlabel.c
new file mode 100644
index 000000000000..d109ec9fb989
--- /dev/null
+++ b/distrib/utils/sysinst/savenewlabel.c
@@ -0,0 +1,107 @@
+/*	$NetBSD: savenewlabel.c,v 1.1 2003/01/11 19:44:05 christos Exp $	*/
+
+/*
+ * Copyright 1997 Jonathan Stone
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed for the NetBSD Project by
+ *      Jonathan Stone.
+ * 4. The name of Jonathan Stone may not be used to endorse
+ *    or promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JONATHAN STONE ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <sys/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: savenewlabel.c,v 1.1 2003/01/11 19:44:05 christos Exp $");
+#endif
+
+#include <sys/types.h>
+#include <errno.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <util.h>
+#include <unistd.h>
+#include <sys/dkio.h>
+#include <sys/ioctl.h>
+#define FSTYPENAMES
+#include <sys/disklabel.h>
+
+#include "defs.h"
+#include "msg_defs.h"
+#include "menu_defs.h"
+
+int
+/*ARGSUSED*/
+savenewlabel(lp, nparts)
+	partinfo *lp;
+	int nparts;
+{
+	FILE *f;
+	int i;
+
+#ifdef DEBUG
+	f = fopen("/tmp/disktab", "a");
+#else
+	/* Create the disktab.preinstall */
+	f = fopen("/etc/disktab", "w");
+#endif
+	if (logging)
+		(void)fprintf(logfp, "Creating disklabel %s\n", bsddiskname);
+	scripting_fprintf(NULL, "cat <<EOF >>/etc/disktab\n");
+	if (f == NULL) {
+		endwin();
+		(void)fprintf(stderr, "Could not open /etc/disktab");
+		if (logging)
+			(void)fprintf(logfp,
+			    "Failed to open /etc/diskabel for appending.\n");
+		exit (1);
+	}
+	scripting_fprintf(f, "%s|NetBSD installation generated:\\\n", bsddiskname);
+	scripting_fprintf(f, "\t:dt=%s:ty=winchester:\\\n", disktype);
+	scripting_fprintf(f, "\t:nc#%d:nt#%d:ns#%d:\\\n", dlcyl, dlhead, dlsec);
+	scripting_fprintf(f, "\t:sc#%d:su#%d:\\\n", dlhead*dlsec, dlsize);
+	scripting_fprintf(f, "\t:se#%d:%s\\\n", sectorsize, doessf);
+	for (i = 0; i < nparts; i++) {
+		scripting_fprintf(f, "\t:p%c#%d:o%c#%d:t%c=%s:",
+		    'a'+i, bsdlabel[i].pi_size,
+		    'a'+i, bsdlabel[i].pi_offset,
+		    'a'+i, fstypenames[bsdlabel[i].pi_fstype]);
+		if (PI_ISBSDFS(&bsdlabel[i]))
+			scripting_fprintf (f, "b%c#%d:f%c#%d:ta=4.2BSD:",
+				       'a'+i, bsdlabel[i].pi_bsize,
+				       'a'+i, bsdlabel[i].pi_fsize);
+	
+		if (i < nparts - 1)
+			scripting_fprintf(f, "\\\n");
+		else
+			scripting_fprintf(f, "\n");
+	}
+	fclose (f);
+	scripting_fprintf(NULL, "EOF\n");
+	fflush(NULL);
+	return(0);
+}
diff --git a/distrib/utils/sysinst/sizemultname.c b/distrib/utils/sysinst/sizemultname.c
new file mode 100644
index 000000000000..a0d671e0a9cd
--- /dev/null
+++ b/distrib/utils/sysinst/sizemultname.c
@@ -0,0 +1,86 @@
+/*	$NetBSD: sizemultname.c,v 1.1 2003/01/11 19:44:05 christos Exp $	*/
+
+/*
+ * Copyright 1997 Piermont Information Systems Inc.
+ * All rights reserved.
+ *
+ * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed for the NetBSD Project by
+ *      Piermont Information Systems Inc.
+ * 4. The name of Piermont Information Systems Inc. may not be used to endorse
+ *    or promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/stat.h>
+#include <curses.h>
+#include <errno.h>
+#include <fts.h>
+#include <util.h>
+#include "defs.h"
+#include "md.h"
+#include "msg_defs.h"
+#include "menu_defs.h"
+
+/*
+ * check that there is at least a / somewhere.
+ */
+int
+check_partitions()
+{
+	int i;
+
+	for (i = 0; i < getmaxpartitions(); i++)
+		if (PI_ISBSDFS(&bsdlabel[i]) &&
+		    fsmount[i][0] == '/' && fsmount[i][1] == '\0')
+			return 1;
+	msg_display(MSG_no_root_fs);
+	getchar();
+	return 0;
+}
+
+void
+set_sizemultname_cyl()
+{
+
+	sizemult = dlcylsize; 
+	multname = msg_string(MSG_cylname);
+}
+
+void
+set_sizemultname_meg()
+{
+
+	sizemult = MEG / sectorsize;
+	multname = msg_string(MSG_megname);
+}
diff --git a/distrib/utils/sysinst/util.c b/distrib/utils/sysinst/util.c
index bd835d706a74..eef4c7b6dc1a 100644
--- a/distrib/utils/sysinst/util.c
+++ b/distrib/utils/sysinst/util.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.78 2003/01/10 20:00:28 christos Exp $	*/
+/*	$NetBSD: util.c,v 1.79 2003/01/11 19:44:05 christos Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1156,41 +1156,6 @@ add_rc_conf(const char *fmt, ...)
 	va_end(ap);
 }
 
-#ifdef notdef
-/*
- * check that there is at least a / somewhere.
- */
-int
-check_partitions()
-{
-	int i;
-
-	for (i = 0; i < getmaxpartitions(); i++)
-		if (PI_ISBSDFS(&bsdlabel[i]) &&
-		    fsmount[i][0] == '/' && fsmount[i][1] == '\0')
-			return 1;
-	msg_display(MSG_no_root_fs);
-	getchar();
-	return 0;
-}
-
-void
-set_sizemultname_cyl()
-{
-
-	sizemult = dlcylsize; 
-	multname = msg_string(MSG_cylname);
-}
-
-void
-set_sizemultname_meg()
-{
-
-	sizemult = MEG / sectorsize;
-	multname = msg_string(MSG_megname);
-}
-#endif
-
 int
 check_lfs_progs()
 {