Subject: CVS commit: src
To: None <>
From: Manuel Bouyer <>
List: source-changes
Date: 11/15/2003 17:52:31
Module Name:	src
Committed By:	bouyer
Date:		Sat Nov 15 17:52:31 UTC 2003

Modified Files:
	src/sbin/disklabel: disklabel.c
	src/sys/arch/next68k/include: disklabel.h
	src/sys/arch/next68k/next68k: disksubr.c
	src/sys/arch/sparc/conf: files.sparc
	src/sys/arch/sparc64/conf: files.sparc64
	src/sys/arch/sun3/conf: files.sun3
	src/sys/arch/sun3/include: disklabel.h
Added Files:
	src/sys/dev/sun: disksubr.c
Removed Files:
	src/sys/arch/sparc/sparc: disksubr.c
	src/sys/arch/sparc64/sparc64: disksubr.c
	src/sys/arch/sun3/sun3: disksubr.c

Log Message:
Commit changes proposed on tech-kern Thu, 6 Nov 2003
- factor out disksubr.c between sun3, sparc and sparc64. Keep the sun3
  groveling code to find a NetBSD disklabel in the first sector (so that it
  can find a label at the old sun3 LABELOFFSET) as a fallback is not
  label at LABELOFFSET, or sun label is present.
- Fix the sun3 LABELOFFSET (was 64, but the kernel wrote the NetBSD label at
- Make next68k disksubr.c always write a next-compatible disklabel.
- remove #ifdef __sparc__ hack from disklabel(8), and change it to issue
  a DIOCWDINFO after writing the disklabel to the raw partition in the
  -r/-I case (so that the kernel can convert the label if needed).

To generate a diff of this commit:
cvs rdiff -r1.121 -r1.122 src/sbin/disklabel/disklabel.c
cvs rdiff -r1.3 -r1.4 src/sys/arch/next68k/include/disklabel.h
cvs rdiff -r1.15 -r1.16 src/sys/arch/next68k/next68k/disksubr.c
cvs rdiff -r1.123 -r1.124 src/sys/arch/sparc/conf/files.sparc
cvs rdiff -r1.36 -r0 src/sys/arch/sparc/sparc/disksubr.c
cvs rdiff -r1.86 -r1.87 src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -r1.19 -r0 src/sys/arch/sparc64/sparc64/disksubr.c
cvs rdiff -r1.70 -r1.71 src/sys/arch/sun3/conf/files.sun3
cvs rdiff -r1.5 -r1.6 src/sys/arch/sun3/include/disklabel.h
cvs rdiff -r1.33 -r0 src/sys/arch/sun3/sun3/disksubr.c
cvs rdiff -r0 -r1.1 src/sys/dev/sun/disksubr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.