Module Name: src
Committed By: abs
Date: Wed Mar 10 23:13:10 UTC 2010
Modified Files:
src/distrib/atari/floppies/prepare: list
src/distrib/mvme68k/miniroot: install.md list
src/distrib/mvme68k/ramdisk: list rd.welcome
src/distrib/notes/mvme68k: install
src/distrib/sets/lists/base: ad.m68000 ad.m68k md.sparc md.sparc64
rescue.ad.m68k rescue.sparc rescue.sparc64 rescue.sun2
src/distrib/sets/lists/comp: md.atari md.mvme68k md.sparc md.sparc64
md.sun2 md.sun3
src/distrib/sun2/miniroot: list
src/distrib/sun2/ramdisk: list
src/distrib/sun3/miniroot: list
src/distrib/sun3/ramdisk: list
src/distrib/utils: Makefile
src/rescue: Makefile
src/sbin: Makefile
Removed Files:
src/rescue: list.edlabel
src/sbin/edlabel: Makefile edlabel.c
Log Message:
Relegate edlabel to use in extremely memory constrained install
ramdisks and prefer disklabel elsewhere.
Based on discussion on affected port lists (port-sparc port-sparc64
port-sun3 port-sun2 port-atari port-mvme68k).
All listed ports plus amd64 test built after change
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/atari/floppies/prepare/list
cvs rdiff -u -r1.5 -r1.6 src/distrib/mvme68k/miniroot/install.md
cvs rdiff -u -r1.20 -r1.21 src/distrib/mvme68k/miniroot/list
cvs rdiff -u -r1.18 -r1.19 src/distrib/mvme68k/ramdisk/list
cvs rdiff -u -r1.3 -r1.4 src/distrib/mvme68k/ramdisk/rd.welcome
cvs rdiff -u -r1.21 -r1.22 src/distrib/notes/mvme68k/install
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/base/ad.m68000
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/base/ad.m68k
cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/base/md.sparc
cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base/rescue.ad.m68k \
src/distrib/sets/lists/base/rescue.sparc \
src/distrib/sets/lists/base/rescue.sparc64 \
src/distrib/sets/lists/base/rescue.sun2
cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/comp/md.atari
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/comp/md.mvme68k
cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/comp/md.sparc
cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/comp/md.sun2
cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/comp/md.sun3
cvs rdiff -u -r1.15 -r1.16 src/distrib/sun2/miniroot/list
cvs rdiff -u -r1.10 -r1.11 src/distrib/sun2/ramdisk/list
cvs rdiff -u -r1.24 -r1.25 src/distrib/sun3/miniroot/list
cvs rdiff -u -r1.6 -r1.7 src/distrib/sun3/ramdisk/list
cvs rdiff -u -r1.18 -r1.19 src/distrib/utils/Makefile
cvs rdiff -u -r1.26 -r1.27 src/rescue/Makefile
cvs rdiff -u -r1.1 -r0 src/rescue/list.edlabel
cvs rdiff -u -r1.115 -r1.116 src/sbin/Makefile
cvs rdiff -u -r1.18 -r0 src/sbin/edlabel/Makefile
cvs rdiff -u -r1.17 -r0 src/sbin/edlabel/edlabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/atari/floppies/prepare/list
diff -u src/distrib/atari/floppies/prepare/list:1.8 src/distrib/atari/floppies/prepare/list:1.9
--- src/distrib/atari/floppies/prepare/list:1.8 Sun Feb 21 20:09:50 2010
+++ src/distrib/atari/floppies/prepare/list Wed Mar 10 23:13:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.8 2010/02/21 20:09:50 tsutsui Exp $
+# $NetBSD: list,v 1.9 2010/03/10 23:13:09 abs Exp $
PROG bin/cat
PROG bin/chmod
@@ -44,6 +44,7 @@
SPECIAL gzip srcdir distrib/utils/x_gzip
SPECIAL umount srcdir distrib/utils/x_umount
+SPECIAL edlabel srcdir distrib/utils/edlabel
# The installation scripts
COPY ${CURDIR}/install.md install.md
Index: src/distrib/mvme68k/miniroot/install.md
diff -u src/distrib/mvme68k/miniroot/install.md:1.5 src/distrib/mvme68k/miniroot/install.md:1.6
--- src/distrib/mvme68k/miniroot/install.md:1.5 Fri May 2 18:31:11 2008
+++ src/distrib/mvme68k/miniroot/install.md Wed Mar 10 23:13:09 2010
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: install.md,v 1.5 2008/05/02 18:31:11 martin Exp $
+# $NetBSD: install.md,v 1.6 2010/03/10 23:13:09 abs Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -179,7 +179,7 @@
__md_prep_disklabel_1
echo -n "Press [Enter] to continue "
getresp ""
- edlabel /dev/r${_disk}c
+ disklabel -i -I /dev/r${_disk}c
}
md_copy_kernel() {
Index: src/distrib/mvme68k/miniroot/list
diff -u src/distrib/mvme68k/miniroot/list:1.20 src/distrib/mvme68k/miniroot/list:1.21
--- src/distrib/mvme68k/miniroot/list:1.20 Thu Feb 11 09:06:49 2010
+++ src/distrib/mvme68k/miniroot/list Wed Mar 10 23:13:09 2010
@@ -1,8 +1,7 @@
-# $NetBSD: list,v 1.20 2010/02/11 09:06:49 roy Exp $
+# $NetBSD: list,v 1.21 2010/03/10 23:13:09 abs Exp $
# mvme68k's extras
PROG sbin/disklabel
-PROG sbin/edlabel
PROG sbin/mount_kernfs
PROG usr/bin/basename
Index: src/distrib/mvme68k/ramdisk/list
diff -u src/distrib/mvme68k/ramdisk/list:1.18 src/distrib/mvme68k/ramdisk/list:1.19
--- src/distrib/mvme68k/ramdisk/list:1.18 Sun Sep 20 19:49:09 2009
+++ src/distrib/mvme68k/ramdisk/list Wed Mar 10 23:13:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.18 2009/09/20 19:49:09 abs Exp $
+# $NetBSD: list,v 1.19 2010/03/10 23:13:09 abs Exp $
SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin
@@ -19,7 +19,6 @@
PROG bin/tftp
PROG sbin/disklabel
-PROG sbin/edlabel
PROG sbin/ifconfig
PROG sbin/init
PROG sbin/installboot
Index: src/distrib/mvme68k/ramdisk/rd.welcome
diff -u src/distrib/mvme68k/ramdisk/rd.welcome:1.3 src/distrib/mvme68k/ramdisk/rd.welcome:1.4
--- src/distrib/mvme68k/ramdisk/rd.welcome:1.3 Sat Apr 10 16:18:11 1999
+++ src/distrib/mvme68k/ramdisk/rd.welcome Wed Mar 10 23:13:09 2010
@@ -1,7 +1,7 @@
Welcome to the NetBSD/mvme68k RAMDISK root!
This environment is designed to do only four things:
- 1: Partititon your disk (use the command: edlabel /dev/rsd?c)
+ 1: Partititon your disk (use the command: disklabel -i -I /dev/rsd?c)
2: Copy a miniroot image into the swap partition (/dev/rsd?b)
3: Make that partition bootable (using 'installboot')
4: Reboot (using the swap partition, i.e. /dev/sd?b).
Index: src/distrib/notes/mvme68k/install
diff -u src/distrib/notes/mvme68k/install:1.21 src/distrib/notes/mvme68k/install:1.22
--- src/distrib/notes/mvme68k/install:1.21 Thu Apr 23 01:56:50 2009
+++ src/distrib/notes/mvme68k/install Wed Mar 10 23:13:09 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: install,v 1.21 2009/04/23 01:56:50 snj Exp $
+.\" $NetBSD: install,v 1.22 2010/03/10 23:13:09 abs Exp $
.\"
.\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -89,7 +89,7 @@
Volume: NBSD
IPL loaded at: $003F0000
-\*[Gt]\*[Gt] BSD MVME147 tapeboot [$Revision: 1.21 $]
+\*[Gt]\*[Gt] BSD MVME147 tapeboot [$Revision: 1.22 $]
578616+422344+55540+[46032+51284]=0x11a6e4
Start @ 0x8000 ...
Copyright (c) 1996, 1997, 1998, 1999, 2000
@@ -122,7 +122,7 @@
Welcome to the NetBSD/\*M RAMDISK root!
This environment is designed to do only four things:
- 1: Partition your disk (use the command: edlabel /dev/rsd0c)
+ 1: Partition your disk (use the command: disklabel -i -I /dev/rsd0c)
2: Copy a miniroot image into the swap partition (/dev/rsd0b)
3: Make that partition bootable (using 'installboot')
4: Reboot (using the swap partition, i.e. /dev/sd0b).
@@ -220,63 +220,44 @@
installation program.
.Pp
To create the disklabel and partitions, use the
-.Li edlabel
+.Li disklabel
program, passing it the name of the Raw Partition of your root/boot disk.
.Pp
-.Dl # Ic "edlabel /dev/rsd0c"
-.Dl edlabel menu:
-.Dl print - display the current disk label
-.Dl modify - prompt for changes to the label
-.Dl write - write the new label to disk
-.Dl quit - terminate program
-.Dl edlabel\*[Gt]
-.Pp
-The program shows what commands it recognizes;
-.Ic print ,
-.Ic modify ,
-.Ic write ,
-and
-.Ic quit .
-It will accept the first letter of a command if
-you don't feel like typing each one in full.
+.Dl # Ic "disklabel -i -I /dev/rsd0c"
+.Dl important disklabel -i options:
+.Dl ? - short help on all commands
+.Dl P - print current partition table
+.Dl W - write the current partition table
+.Dl Q - quit
+.Dl [a-p] - define named partition
.Pp
To start creating the basic partitions, you should enter
-.Ic m No (modify)
-at the edlabel prompt, then enter the letter corresponding to the first
-.No partition, Sy a .
-.Pp
-.Dl edlabel\*[Gt] Ic m
-.Pp
-.Dl modify subcommands:
-.Dl @ : modify disk parameters
-.Dl a-h : modify partition
-.Dl s : standardize geometry
-.Dl q : quit this subcommand
-.Dl edlabel/modify\*[Gt] Ic a
-.Dl a (root) 0 (0/00/00) 0 (0/00/00) unused
-.Dl start as \*[Lt]blkno\*[Gt] or \*[Lt]cyls/trks/sects\*[Gt] : Ic 0
-.Dl length as \*[Lt]nblks\*[Gt] or \*[Lt]cyls/trks/sects\*[Gt] : Ic 65536
-.Dl type: Ic 4.2BSD
-.Dl edlabel/modify\*[Gt]
-.Pp
-When you enter the start and length of a partition, you can use either
-blocks or cylinder/track/sector notation.
-If this is the first time you've partitioned a disk for
-.Nx ,
-it's probably easiest to use block
-notation.
+.Ic a
+at the partition\*[Gt] prompt.
+.Li disklabel
+will then prompt for the partition information in a form similar to:
+.Pp
+.Dl partition> Ic a
+.Dl Filesystem type [?] [unused]: Ic 4.2BSD
+.Dl Start offset ('x' to start after part 'x') [0c, 0s, 0M]:
+.Dl Partition size ('$' for all remaining) [0c, 0s, 0M]: Ic 32m
+.Pp
+When you enter the start and length of a partition, you can append
+s, c, m, or g to specify sectors, cylinders, megabytes or gigabytes
+respectively.
+.Pp
The above example creates partition
.Sq Li a ,
-starting at block zero
-and with a size of 65536 blocks.
-Note that the usual size of a block is
-512 bytes, so this creates a 32 MB partition.
+starting at sector zero
+and with a size of 32MB.
.Pp
The
.Li type
of the partition should be
.Li 4.2BSD ,
-otherwise you won't be able to create a file system on it.
+which is the recommended
+.Nx
+file system type.
.Pp
Next, create a swap partition (b).
Note that the minimum size of this swap partition should be 8 MB,
@@ -284,46 +265,26 @@
.Nx
installation!
.Pp
-.Dl edlabel/modify\*[Gt] Ic b
-.Dl b (swap) 0 (0/00/00) 0 (0/00/00) unused
-.Dl start as \*[Lt]blkno\*[Gt] or \*[Lt]cyls/trks/sects\*[Gt] : Ic 65536
-.Dl length as \*[Lt]nblks\*[Gt] or \*[Lt]cyls/trks/sects\*[Gt] : Ic 32768
-.Dl type: Ic swap
-.Dl edlabel/modify\*[Gt]
-.Pp
-Here, we specify a value for
-.Li start
-such that the swap partition follows immediately after partition
-.Sq Li a ,
-i.e. 65536.
-The length of the swap partition should be a multiple of the
-amount of RAM you have in your system.
-Here, we've chosen 32768, or 16 MB.
-The next available block on the drive is thus 65536 + 32768.
-We will use this to create partition
+.Dl partition> Ic b
+.Dl Filesystem type [?] [unused]: Ic swap
+.Dl Start offset ('x' to start after part 'x') [0c, 0s, 0M]: Ic a
+.Dl Partition size ('$' for all remaining) [0c, 0s, 0M]: Ic 16m
+.Pp
+Here, we specify that the swap partition starts immediatedly after the
+.Sq Li a
+partition and is of size 16MB.
+The length of the swap partition should be at least as large as the
+amount of RAM in your system and ideally 64MB or over.
+The remainder of the disk can be alloacted to the
.Sq Li d
-for our
+partition for the
.Pa /usr
file system.
-(Note that for a busy system, or a system with more
-than 8 MB of RAM, you'll be better off with a 32 or 64 MB swap partition.)
.Pp
-.Dl edlabel/modify\*[Gt] Ic d
-.Dl d (user) 0 (0/00/00) 0 (0/00/00) unused
-.Dl start as \*[Lt]blkno\*[Gt] or \*[Lt]cyls/trks/sects\*[Gt] : Ic 98304
-.Dl length as \*[Lt]nblks\*[Gt] or \*[Lt]cyls/trks/sects\*[Gt] : Ic 1540096
-.Dl type: Ic 4.2BSD
-.Dl edlabel/modify\*[Gt] Ic q
-.Dl edlabel\*[Gt]
-.Pp
-As you can see, we've chosen to assign the remainder of the disk to
-.Pa /usr .
-Since there are 1638400 sectors on the example disk (did you remember to
-note down the number of sectors on your disk during boot?), and partition
-.Sy d
-starts at sector 98304, a simple bit of arithmetic (1638400 - 98304)
-gives
-.Sy d No a size of 1540096.
+.Dl partition> Ic d
+.Dl Filesystem type [?] [unused]: Ic 4.2BSD
+.Dl Start offset ('x' to start after part 'x') [0c, 0s, 0M]: Ic b
+.Dl Partition size ('$' for all remaining) [0c, 0s, 0M]: Ic $
.Pp
Note that the above partition sizes are just guidelines.
If your disk is large enough, you should resize the partitions
@@ -332,34 +293,11 @@
You now need to write this new disklabel, together with the partition
details you've just entered, to disk.
You might also try the
-.Sq Ic p
+.Sq Ic P
command
to view the partitions.
Once written, you can quit back to the shell using
-.Sq Ic q .
-.Pp
-.Dl edlabel\*[Gt] Ic p
-.(disp
- type_num: 4
- sub_type: 0
- type_name: SCSI disk
- pack_name: fictitious
- bytes/sector: 512
- sectors/track: 128
- tracks/cylinder: 16
- cylinders: 800
-sectors/cylinder: 2048
-partition start (c/t/s) nblks (c/t/s) type
-
- a (root) 0 (0/00/00) 65536 (32/00/00) 4.2BSD
- b (swap) 65536 (32/00/00) 32768 (48/00/00) swap
- c (disk) 0 (0/00/00) 1638400 (800/00/00) unused
- d (user) 98304 (48/00/00) 1540096 (752/00/00) 4.2BSD
-.disp)
-.Pp
-.Dl edlabel\*[Gt] Ic w
-.Dl edlabel\*[Gt] Ic q
-.Dl #
+.Sq Ic Q .
.Pp
Now that your disk's partitioned, you need to get the proper installation
miniroot image onto it.
@@ -497,7 +435,7 @@
.Pp
.(disp
Start @ 0x8000 ...
-\*[Gt]\*[Gt] BSD MVME147 netboot (via sboot) [$Revision: 1.21 $]
+\*[Gt]\*[Gt] BSD MVME147 netboot (via sboot) [$Revision: 1.22 $]
device: le0 attached to 08:00:3e:20:cb:87
boot: client IP address: 192.168.1.4
boot: client name: soapy
Index: src/distrib/sets/lists/base/ad.m68000
diff -u src/distrib/sets/lists/base/ad.m68000:1.1 src/distrib/sets/lists/base/ad.m68000:1.2
--- src/distrib/sets/lists/base/ad.m68000:1.1 Mon Nov 30 07:02:24 2009
+++ src/distrib/sets/lists/base/ad.m68000 Wed Mar 10 23:13:09 2010
@@ -1,2 +1,2 @@
-# $NetBSD: ad.m68000,v 1.1 2009/11/30 07:02:24 he Exp $
-./sbin/edlabel base-sysutil-root
+# $NetBSD: ad.m68000,v 1.2 2010/03/10 23:13:09 abs Exp $
+./sbin/edlabel base-sysutil-root obsolete
Index: src/distrib/sets/lists/base/ad.m68k
diff -u src/distrib/sets/lists/base/ad.m68k:1.17 src/distrib/sets/lists/base/ad.m68k:1.18
--- src/distrib/sets/lists/base/ad.m68k:1.17 Sat Feb 14 22:46:05 2009
+++ src/distrib/sets/lists/base/ad.m68k Wed Mar 10 23:13:09 2010
@@ -1,3 +1,3 @@
-# $NetBSD: ad.m68k,v 1.17 2009/02/14 22:46:05 abs Exp $
-./sbin/edlabel base-sysutil-root
+# $NetBSD: ad.m68k,v 1.18 2010/03/10 23:13:09 abs Exp $
+./sbin/edlabel base-sysutil-root obsolete
./usr/bin/fdformat base-util-bin
Index: src/distrib/sets/lists/base/md.sparc
diff -u src/distrib/sets/lists/base/md.sparc:1.79 src/distrib/sets/lists/base/md.sparc:1.80
--- src/distrib/sets/lists/base/md.sparc:1.79 Mon Feb 16 12:33:01 2009
+++ src/distrib/sets/lists/base/md.sparc Wed Mar 10 23:13:09 2010
@@ -1,5 +1,5 @@
-# $NetBSD: md.sparc,v 1.79 2009/02/16 12:33:01 abs Exp $
-./sbin/edlabel base-sysutil-root
+# $NetBSD: md.sparc,v 1.80 2010/03/10 23:13:09 abs Exp $
+./sbin/edlabel base-sysutil-root obsolete
./lib/libsparc_v8.so.0 base-sys-shlib dynamicroot,pic
./lib/libsparc_v8.so.0.0 base-sys-shlib dynamicroot,pic
./sbin/ldconfig base-sysutil-root pic
Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.78 src/distrib/sets/lists/base/md.sparc64:1.79
--- src/distrib/sets/lists/base/md.sparc64:1.78 Mon Mar 8 06:40:06 2010
+++ src/distrib/sets/lists/base/md.sparc64 Wed Mar 10 23:13:09 2010
@@ -1,6 +1,6 @@
-# $NetBSD: md.sparc64,v 1.78 2010/03/08 06:40:06 lukem Exp $
+# $NetBSD: md.sparc64,v 1.79 2010/03/10 23:13:09 abs Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
-./sbin/edlabel base-sysutil-root
+./sbin/edlabel base-sysutil-root obsolete
./usr/bin/fdformat base-util-bin
./usr/lib/sparc base-compat-lib compat
./usr/lib/sparc/i18n base-compat-lib compat
Index: src/distrib/sets/lists/base/rescue.ad.m68k
diff -u src/distrib/sets/lists/base/rescue.ad.m68k:1.2 src/distrib/sets/lists/base/rescue.ad.m68k:1.3
--- src/distrib/sets/lists/base/rescue.ad.m68k:1.2 Sat Feb 14 19:29:30 2009
+++ src/distrib/sets/lists/base/rescue.ad.m68k Wed Mar 10 23:13:09 2010
@@ -1,2 +1,2 @@
-# $NetBSD: rescue.ad.m68k,v 1.2 2009/02/14 19:29:30 abs Exp $
-./rescue/edlabel base-rescue-root
+# $NetBSD: rescue.ad.m68k,v 1.3 2010/03/10 23:13:09 abs Exp $
+./rescue/edlabel base-rescue-root obsolete
Index: src/distrib/sets/lists/base/rescue.sparc
diff -u src/distrib/sets/lists/base/rescue.sparc:1.2 src/distrib/sets/lists/base/rescue.sparc:1.3
--- src/distrib/sets/lists/base/rescue.sparc:1.2 Sun Jan 11 10:24:59 2004
+++ src/distrib/sets/lists/base/rescue.sparc Wed Mar 10 23:13:09 2010
@@ -1,3 +1,3 @@
-# $NetBSD: rescue.sparc,v 1.2 2004/01/11 10:24:59 lukem Exp $
-./rescue/edlabel base-rescue-root
+# $NetBSD: rescue.sparc,v 1.3 2010/03/10 23:13:09 abs Exp $
+./rescue/edlabel base-rescue-root obsolete
./rescue/ldconfig base-rescue-root
Index: src/distrib/sets/lists/base/rescue.sparc64
diff -u src/distrib/sets/lists/base/rescue.sparc64:1.2 src/distrib/sets/lists/base/rescue.sparc64:1.3
--- src/distrib/sets/lists/base/rescue.sparc64:1.2 Sun Jan 11 10:24:59 2004
+++ src/distrib/sets/lists/base/rescue.sparc64 Wed Mar 10 23:13:09 2010
@@ -1,2 +1,2 @@
-# $NetBSD: rescue.sparc64,v 1.2 2004/01/11 10:24:59 lukem Exp $
-./rescue/edlabel base-rescue-root
+# $NetBSD: rescue.sparc64,v 1.3 2010/03/10 23:13:09 abs Exp $
+./rescue/edlabel base-rescue-root obsolete
Index: src/distrib/sets/lists/base/rescue.sun2
diff -u src/distrib/sets/lists/base/rescue.sun2:1.2 src/distrib/sets/lists/base/rescue.sun2:1.3
--- src/distrib/sets/lists/base/rescue.sun2:1.2 Sun Jan 11 10:24:59 2004
+++ src/distrib/sets/lists/base/rescue.sun2 Wed Mar 10 23:13:09 2010
@@ -1,2 +1,2 @@
-# $NetBSD: rescue.sun2,v 1.2 2004/01/11 10:24:59 lukem Exp $
-./rescue/edlabel base-rescue-root
+# $NetBSD: rescue.sun2,v 1.3 2010/03/10 23:13:09 abs Exp $
+./rescue/edlabel base-rescue-root obsolete
Index: src/distrib/sets/lists/comp/md.atari
diff -u src/distrib/sets/lists/comp/md.atari:1.55 src/distrib/sets/lists/comp/md.atari:1.56
--- src/distrib/sets/lists/comp/md.atari:1.55 Fri Aug 22 13:42:19 2008
+++ src/distrib/sets/lists/comp/md.atari Wed Mar 10 23:13:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.atari,v 1.55 2008/08/22 13:42:19 lukem Exp $
+# $NetBSD: md.atari,v 1.56 2010/03/10 23:13:09 abs Exp $
./usr/include/atari comp-c-include
./usr/include/atari/_G_config.h comp-obsolete obsolete
./usr/include/atari/ahdilabel.h comp-c-include
@@ -61,7 +61,7 @@
./usr/libdata/debug/sbin/ahdilabel.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/binpatch.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/edahdi.debug comp-sysutil-debug debug
-./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug debug
+./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug obsolete
./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/msconfig.debug comp-util-debug debug
./usr/libdata/debug/usr/sbin/bootpref.debug comp-sysutil-debug debug
Index: src/distrib/sets/lists/comp/md.mvme68k
diff -u src/distrib/sets/lists/comp/md.mvme68k:1.33 src/distrib/sets/lists/comp/md.mvme68k:1.34
--- src/distrib/sets/lists/comp/md.mvme68k:1.33 Fri Aug 22 13:42:19 2008
+++ src/distrib/sets/lists/comp/md.mvme68k Wed Mar 10 23:13:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.mvme68k,v 1.33 2008/08/22 13:42:19 lukem Exp $
+# $NetBSD: md.mvme68k,v 1.34 2010/03/10 23:13:09 abs Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/mvme68k comp-c-include
./usr/include/mvme68k/_G_config.h comp-obsolete obsolete
@@ -52,4 +52,4 @@
./usr/include/mvme68k/vmparam.h comp-c-include
./usr/include/mvme68k/wchar_limits.h comp-c-include
./usr/include/mvme68k/z8530var.h comp-c-include
-./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug debug
+./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug obsolete
Index: src/distrib/sets/lists/comp/md.sparc
diff -u src/distrib/sets/lists/comp/md.sparc:1.68 src/distrib/sets/lists/comp/md.sparc:1.69
--- src/distrib/sets/lists/comp/md.sparc:1.68 Fri Oct 31 20:24:52 2008
+++ src/distrib/sets/lists/comp/md.sparc Wed Mar 10 23:13:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.68 2008/10/31 20:24:52 mrg Exp $
+# $NetBSD: md.sparc,v 1.69 2010/03/10 23:13:09 abs Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
@@ -132,7 +132,7 @@
./usr/include/sparc64/vuid_event.h comp-c-include
./usr/include/sparc64/wchar_limits.h comp-c-include
./usr/include/sparc64/z8530var.h comp-c-include
-./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug debug
+./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug obsolete
./usr/libdata/debug/sbin/ldconfig.debug comp-sysutil-debug debug,pic
./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug
./usr/libdata/debug/usr/sbin/apm.debug comp-sysutil-debug debug
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.53 src/distrib/sets/lists/comp/md.sparc64:1.54
--- src/distrib/sets/lists/comp/md.sparc64:1.53 Wed Feb 3 15:34:37 2010
+++ src/distrib/sets/lists/comp/md.sparc64 Wed Mar 10 23:13:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.53 2010/02/03 15:34:37 roy Exp $
+# $NetBSD: md.sparc64,v 1.54 2010/03/10 23:13:09 abs Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
@@ -597,7 +597,7 @@
./usr/lib/sparc/libz.so base-sys-shlib compat,pic
./usr/lib/sparc/libz_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libz_pic.a comp-c-piclib compat,pic
-./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug debug
+./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug obsolete
./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug
./usr/libdata/debug/usr/sbin/eeprom.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/ofctl.debug comp-sysutil-debug debug
Index: src/distrib/sets/lists/comp/md.sun2
diff -u src/distrib/sets/lists/comp/md.sun2:1.17 src/distrib/sets/lists/comp/md.sun2:1.18
--- src/distrib/sets/lists/comp/md.sun2:1.17 Fri Aug 22 13:42:19 2008
+++ src/distrib/sets/lists/comp/md.sun2 Wed Mar 10 23:13:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.sun2,v 1.17 2008/08/22 13:42:19 lukem Exp $
+# $NetBSD: md.sun2,v 1.18 2010/03/10 23:13:09 abs Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/sun2 comp-c-include
./usr/include/sun2/_G_config.h comp-obsolete obsolete
@@ -69,4 +69,4 @@
./usr/include/sun68k/intr.h comp-c-include
./usr/include/sun68k/mon.h comp-c-include
./usr/include/sun68k/psl.h comp-c-include
-./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug debug
+./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug obsolete
Index: src/distrib/sets/lists/comp/md.sun3
diff -u src/distrib/sets/lists/comp/md.sun3:1.59 src/distrib/sets/lists/comp/md.sun3:1.60
--- src/distrib/sets/lists/comp/md.sun3:1.59 Fri Aug 22 13:42:19 2008
+++ src/distrib/sets/lists/comp/md.sun3 Wed Mar 10 23:13:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.sun3,v 1.59 2008/08/22 13:42:19 lukem Exp $
+# $NetBSD: md.sun3,v 1.60 2010/03/10 23:13:09 abs Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/sun3 comp-c-include
./usr/include/sun3/_G_config.h comp-obsolete obsolete
@@ -80,5 +80,5 @@
./usr/include/sun68k/intr.h comp-c-include
./usr/include/sun68k/mon.h comp-c-include
./usr/include/sun68k/psl.h comp-c-include
-./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug debug
+./usr/libdata/debug/sbin/edlabel.debug comp-sysutil-debug obsolete
./usr/libdata/debug/usr/sbin/eeprom.debug comp-sysutil-debug debug
Index: src/distrib/sun2/miniroot/list
diff -u src/distrib/sun2/miniroot/list:1.15 src/distrib/sun2/miniroot/list:1.16
--- src/distrib/sun2/miniroot/list:1.15 Thu Feb 11 09:06:50 2010
+++ src/distrib/sun2/miniroot/list Wed Mar 10 23:13:09 2010
@@ -1,5 +1,5 @@
#
-# $NetBSD: list,v 1.15 2010/02/11 09:06:50 roy Exp $
+# $NetBSD: list,v 1.16 2010/03/10 23:13:09 abs Exp $
#
# The PROM provides a default kernel name of "vmunix"
@@ -144,6 +144,7 @@
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
+SPECIAL edlabel srcdir distrib/utils/edlabel
ARGVLN sh -sh
Index: src/distrib/sun2/ramdisk/list
diff -u src/distrib/sun2/ramdisk/list:1.10 src/distrib/sun2/ramdisk/list:1.11
--- src/distrib/sun2/ramdisk/list:1.10 Sun Sep 20 22:46:14 2009
+++ src/distrib/sun2/ramdisk/list Wed Mar 10 23:13:09 2010
@@ -1,5 +1,5 @@
#
-# $NetBSD: list,v 1.10 2009/09/20 22:46:14 abs Exp $
+# $NetBSD: list,v 1.11 2010/03/10 23:13:09 abs Exp $
#
# ramdisk/list - packing list for the ramdisk.
#
@@ -87,6 +87,7 @@
SPECIAL route srcdir distrib/utils/x_route
SPECIAL ssh srcdir distrib/utils/ssh
SPECIAL umount srcdir distrib/utils/x_umount
+SPECIAL edlabel srcdir distrib/utils/edlabel
# various files that we need in /etc for the install
COPY ${CURDIR}/fstab etc/fstab
Index: src/distrib/sun3/miniroot/list
diff -u src/distrib/sun3/miniroot/list:1.24 src/distrib/sun3/miniroot/list:1.25
--- src/distrib/sun3/miniroot/list:1.24 Thu Feb 11 09:06:51 2010
+++ src/distrib/sun3/miniroot/list Wed Mar 10 23:13:10 2010
@@ -1,5 +1,5 @@
#
-# $NetBSD: list,v 1.24 2010/02/11 09:06:51 roy Exp $
+# $NetBSD: list,v 1.25 2010/03/10 23:13:10 abs Exp $
#
COPY ${KERNEL3} netbsd.sun3
@@ -143,6 +143,7 @@
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
+SPECIAL edlabel srcdir distrib/utils/edlabel
ARGVLN sh -sh
Index: src/distrib/sun3/ramdisk/list
diff -u src/distrib/sun3/ramdisk/list:1.6 src/distrib/sun3/ramdisk/list:1.7
--- src/distrib/sun3/ramdisk/list:1.6 Sun Sep 20 22:46:14 2009
+++ src/distrib/sun3/ramdisk/list Wed Mar 10 23:13:10 2010
@@ -1,5 +1,5 @@
#
-# $NetBSD: list,v 1.6 2009/09/20 22:46:14 abs Exp $
+# $NetBSD: list,v 1.7 2010/03/10 23:13:10 abs Exp $
#
# ramdisk/list - packing list for the ramdisk.
#
@@ -87,6 +87,7 @@
SPECIAL route srcdir distrib/utils/x_route
SPECIAL ssh srcdir distrib/utils/ssh
SPECIAL umount srcdir distrib/utils/x_umount
+SPECIAL edlabel srcdir distrib/utils/edlabel
# various files that we need in /etc for the install
COPY ${CURDIR}/fstab etc/fstab
Index: src/distrib/utils/Makefile
diff -u src/distrib/utils/Makefile:1.18 src/distrib/utils/Makefile:1.19
--- src/distrib/utils/Makefile:1.18 Fri Nov 21 15:39:29 2008
+++ src/distrib/utils/Makefile Wed Mar 10 23:13:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/11/21 15:39:29 ad Exp $
+# $NetBSD: Makefile,v 1.19 2010/03/10 23:13:10 abs Exp $
.if make(obj)
@@ -10,6 +10,10 @@
SUBDIR+=sparkcrc
.endif
+.if ${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k"
+SUBDIR+=edlabel
+.endif
+
# IPv6
SUBDIR+=x_ping6
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.26 src/rescue/Makefile:1.27
--- src/rescue/Makefile:1.26 Sat Feb 13 11:21:55 2010
+++ src/rescue/Makefile Wed Mar 10 23:13:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2010/02/13 11:21:55 roy Exp $
+# $NetBSD: Makefile,v 1.27 2010/03/10 23:13:10 abs Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -19,7 +19,7 @@
TARGETDIR= ${DESTDIR}/rescue
PARSELISTENV+= TARGETDIR=${TARGETDIR:Q}
-.for f in edlabel ldconfig pdisk
+.for f in ldconfig pdisk
PROG_${f}!= cd ${NETBSDSRCDIR}/sbin/${f} && ${MAKE} -V PROG
.if (${PROG_${f}} != "")
LISTS+= ${.CURDIR}/list.${f}
Index: src/sbin/Makefile
diff -u src/sbin/Makefile:1.115 src/sbin/Makefile:1.116
--- src/sbin/Makefile:1.115 Thu Jan 14 21:29:26 2010
+++ src/sbin/Makefile Wed Mar 10 23:13:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2010/01/14 21:29:26 pooka Exp $
+# $NetBSD: Makefile,v 1.116 2010/03/10 23:13:10 abs Exp $
# @(#)Makefile 8.5 (Berkeley) 3/31/94
# Not ported: XNSrouted enpload scsiformat startslip
@@ -8,7 +8,7 @@
SUBDIR= amrctl apmlabel atactl badsect bioctl brconfig ccdconfig \
disklabel dkctl dkscan_bsdlabel dmesg \
- drvctl edlabel fastboot fdisk fsck fsirand gpt ifconfig init ldconfig \
+ drvctl fastboot fdisk fsck fsirand gpt ifconfig init ldconfig \
mbrlabel mknod modload modstat modunload mount newbtconf nologin \
pdisk ping pppoectl raidctl reboot rcorder rndctl route routed \
savecore scan_ffs scsictl shutdown slattach svhlabel swapctl sysctl \
