Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Add getlabelusesmbr(), as proposed in



details:   https://anonhg.NetBSD.org/src/rev/3449251fbb5c
branches:  trunk
changeset: 769033:3449251fbb5c
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue Aug 30 12:39:49 2011 +0000

description:
Add getlabelusesmbr(), as proposed in
http://mail-index.netbsd.org/tech-userlevel/2011/08/25/msg005404.html
This is used by disk tools such as disklabel(8) to dynamically decide is
the undelyling platform uses a disklabel-in-mbr-partition or not
(instead of using a compile-time list of ports).
getlabelusesmbr() reads the sysctl kern.labelusesmbr, takes its value from the
machdep #define LABELUSESMBR.
For evbmips, make LABELUSESMBR 1 if the platform uses pmon
as bootloader, and 0 (the previous value) otherwise.

diffstat:

 distrib/sets/lists/base/ad.mips64eb      |   6 +++---
 distrib/sets/lists/base/ad.mips64el      |   6 +++---
 distrib/sets/lists/base/md.amd64         |   4 ++--
 distrib/sets/lists/base/md.sparc64       |   4 ++--
 distrib/sets/lists/base/shl.mi           |   6 +++---
 distrib/sets/lists/comp/ad.mips64eb      |   6 +++---
 distrib/sets/lists/comp/ad.mips64el      |   6 +++---
 distrib/sets/lists/comp/md.amd64         |   4 ++--
 distrib/sets/lists/comp/md.sparc64       |   4 ++--
 distrib/sets/lists/comp/mi               |   5 ++++-
 distrib/sets/lists/comp/shl.mi           |   4 ++--
 include/util.h                           |   3 ++-
 lib/libutil/Makefile                     |   3 ++-
 lib/libutil/getlabelsector.3             |  17 +++++++++++++----
 lib/libutil/getlabelsector.c             |  17 +++++++++++++++--
 lib/libutil/shlib_version                |   4 ++--
 sbin/disklabel/Makefile                  |  32 +-------------------------------
 sbin/disklabel/main.c                    |  14 +++++++++-----
 sys/arch/acorn26/include/disklabel.h     |   4 +++-
 sys/arch/acorn32/include/disklabel.h     |   4 +++-
 sys/arch/algor/include/disklabel.h       |   3 ++-
 sys/arch/alpha/include/disklabel.h       |   3 ++-
 sys/arch/amd64/include/disklabel.h       |   3 ++-
 sys/arch/amiga/include/disklabel.h       |   3 ++-
 sys/arch/amigappc/include/disklabel.h    |   3 ++-
 sys/arch/arc/include/disklabel.h         |   3 ++-
 sys/arch/arm/include/disklabel.h         |   5 ++++-
 sys/arch/atari/include/disklabel.h       |   3 ++-
 sys/arch/bebox/include/disklabel.h       |   3 ++-
 sys/arch/cats/include/disklabel.h        |   3 ++-
 sys/arch/cesfic/include/disklabel.h      |   3 ++-
 sys/arch/cobalt/include/disklabel.h      |   3 ++-
 sys/arch/dreamcast/include/disklabel.h   |   3 ++-
 sys/arch/emips/include/disklabel.h       |   3 ++-
 sys/arch/evbarm/include/disklabel.h      |   3 ++-
 sys/arch/evbmips/include/disklabel.h     |  11 +++++++++--
 sys/arch/evbppc/include/disklabel.h      |   4 +++-
 sys/arch/evbsh3/include/disklabel.h      |   3 ++-
 sys/arch/ews4800mips/include/disklabel.h |   3 ++-
 sys/arch/hp300/include/disklabel.h       |   3 ++-
 sys/arch/hp700/include/disklabel.h       |   3 ++-
 sys/arch/hpcarm/include/disklabel.h      |   3 ++-
 sys/arch/hpcmips/include/disklabel.h     |   3 ++-
 sys/arch/hpcsh/include/disklabel.h       |   3 ++-
 sys/arch/i386/include/disklabel.h        |   3 ++-
 sys/arch/ia64/include/disklabel.h        |   3 ++-
 sys/arch/ibmnws/include/disklabel.h      |   3 ++-
 sys/arch/iyonix/include/disklabel.h      |   3 ++-
 sys/arch/landisk/include/disklabel.h     |   3 ++-
 sys/arch/luna68k/include/disklabel.h     |   3 ++-
 sys/arch/mac68k/include/disklabel.h      |   3 ++-
 sys/arch/macppc/include/disklabel.h      |   3 ++-
 sys/arch/mipsco/include/disklabel.h      |   3 ++-
 sys/arch/mmeye/include/disklabel.h       |   3 ++-
 sys/arch/mvme68k/include/disklabel.h     |   3 ++-
 sys/arch/mvmeppc/include/disklabel.h     |   3 ++-
 sys/arch/netwinder/include/disklabel.h   |   3 ++-
 sys/arch/news68k/include/disklabel.h     |   3 ++-
 sys/arch/newsmips/include/disklabel.h    |   3 ++-
 sys/arch/next68k/include/disklabel.h     |   4 +++-
 sys/arch/ofppc/include/disklabel.h       |   3 ++-
 sys/arch/pmax/include/disklabel.h        |   3 ++-
 sys/arch/prep/include/disklabel.h        |   3 ++-
 sys/arch/rs6000/include/disklabel.h      |   3 ++-
 sys/arch/sandpoint/include/disklabel.h   |   3 ++-
 sys/arch/sbmips/include/disklabel.h      |   3 ++-
 sys/arch/sgimips/include/disklabel.h     |   3 ++-
 sys/arch/shark/include/disklabel.h       |   3 ++-
 sys/arch/sparc/include/disklabel.h       |   3 ++-
 sys/arch/sun3/include/disklabel.h        |   3 ++-
 sys/arch/sun68k/include/disklabel.h      |   3 ++-
 sys/arch/vax/include/disklabel.h         |   3 ++-
 sys/arch/x68k/include/disklabel.h        |   3 ++-
 sys/arch/zaurus/include/disklabel.h      |   3 ++-
 sys/kern/init_sysctl.c                   |  10 ++++++++--
 75 files changed, 206 insertions(+), 131 deletions(-)

diffs (truncated from 1423 to 300 lines):

diff -r 0c59056be4e8 -r 3449251fbb5c distrib/sets/lists/base/ad.mips64eb
--- a/distrib/sets/lists/base/ad.mips64eb       Tue Aug 30 12:13:25 2011 +0000
+++ b/distrib/sets/lists/base/ad.mips64eb       Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.64 2011/08/28 07:48:18 christos Exp $
+# $NetBSD: ad.mips64eb,v 1.65 2011/08/30 12:39:49 bouyer Exp $
 ./libexec/ld.elf_so-64                         base-compat-shlib       compat,pic
 ./libexec/ld.elf_so-o32                                base-sysutil-bin        compat,pic
 ./usr/lib/64                                   base-compat-lib
@@ -257,7 +257,7 @@
 ./usr/lib/64/libusbhid.so.1                    base-compat-shlib       compat,pic
 ./usr/lib/64/libusbhid.so.1.0                  base-compat-shlib       compat,pic
 ./usr/lib/64/libutil.so.7                      base-compat-shlib       compat,pic
-./usr/lib/64/libutil.so.7.18                   base-compat-shlib       compat,pic
+./usr/lib/64/libutil.so.7.19                   base-compat-shlib       compat,pic
 ./usr/lib/64/libwind.so.0                      base-compat-shlib       compat,pic,kerberos
 ./usr/lib/64/libwind.so.0.0                    base-compat-shlib       compat,pic,kerberos
 ./usr/lib/64/libwrap.so.1                      base-compat-shlib       compat,pic
@@ -543,7 +543,7 @@
 ./usr/lib/o32/libusbhid.so.1                   base-compat-shlib       compat,pic
 ./usr/lib/o32/libusbhid.so.1.0                 base-compat-shlib       compat,pic
 ./usr/lib/o32/libutil.so.7                     base-compat-shlib       compat,pic
-./usr/lib/o32/libutil.so.7.18                  base-compat-shlib       compat,pic
+./usr/lib/o32/libutil.so.7.19                  base-compat-shlib       compat,pic
 ./usr/lib/o32/libwind.so.0                     base-compat-shlib       compat,pic,kerberos
 ./usr/lib/o32/libwind.so.0.0                   base-compat-shlib       compat,pic,kerberos
 ./usr/lib/o32/libwrap.so.1                     base-compat-shlib       compat,pic
diff -r 0c59056be4e8 -r 3449251fbb5c distrib/sets/lists/base/ad.mips64el
--- a/distrib/sets/lists/base/ad.mips64el       Tue Aug 30 12:13:25 2011 +0000
+++ b/distrib/sets/lists/base/ad.mips64el       Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.61 2011/08/28 07:48:18 christos Exp $
+# $NetBSD: ad.mips64el,v 1.62 2011/08/30 12:39:49 bouyer Exp $
 ./libexec/ld.elf_so-64                         base-compat-shlib       compat,pic
 ./libexec/ld.elf_so-o32                                base-sysutil-bin        compat,pic
 ./usr/lib/64                                   base-compat-lib
@@ -257,7 +257,7 @@
 ./usr/lib/64/libusbhid.so.1                    base-compat-shlib       compat,pic
 ./usr/lib/64/libusbhid.so.1.0                  base-compat-shlib       compat,pic
 ./usr/lib/64/libutil.so.7                      base-compat-shlib       compat,pic
-./usr/lib/64/libutil.so.7.18                   base-compat-shlib       compat,pic
+./usr/lib/64/libutil.so.7.19                   base-compat-shlib       compat,pic
 ./usr/lib/64/libwind.so.0                      base-compat-shlib       compat,pic,kerberos
 ./usr/lib/64/libwind.so.0.0                    base-compat-shlib       compat,pic,kerberos
 ./usr/lib/64/libwrap.so.1                      base-compat-shlib       compat,pic
@@ -543,7 +543,7 @@
 ./usr/lib/o32/libusbhid.so.1                   base-compat-shlib       compat,pic
 ./usr/lib/o32/libusbhid.so.1.0                 base-compat-shlib       compat,pic
 ./usr/lib/o32/libutil.so.7                     base-compat-shlib       compat,pic
-./usr/lib/o32/libutil.so.7.18                  base-compat-shlib       compat,pic
+./usr/lib/o32/libutil.so.7.19                  base-compat-shlib       compat,pic
 ./usr/lib/o32/libwind.so.0                     base-compat-shlib       compat,pic,kerberos
 ./usr/lib/o32/libwind.so.0.0                   base-compat-shlib       compat,pic,kerberos
 ./usr/lib/o32/libwrap.so.1                     base-compat-shlib       compat,pic
diff -r 0c59056be4e8 -r 3449251fbb5c distrib/sets/lists/base/md.amd64
--- a/distrib/sets/lists/base/md.amd64  Tue Aug 30 12:13:25 2011 +0000
+++ b/distrib/sets/lists/base/md.amd64  Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.135 2011/08/28 07:48:18 christos Exp $
+# $NetBSD: md.amd64,v 1.136 2011/08/30 12:39:49 bouyer Exp $
 ./dev/lms0                                     base-obsolete           obsolete
 ./dev/mms0                                     base-obsolete           obsolete
 ./libexec/ld.elf_so-i386                       base-sys-shlib          compat,pic
@@ -260,7 +260,7 @@
 ./usr/lib/i386/libusbhid.so.1                  base-compat-shlib       compat,pic
 ./usr/lib/i386/libusbhid.so.1.0                        base-compat-shlib       compat,pic
 ./usr/lib/i386/libutil.so.7                    base-compat-shlib       compat,pic
-./usr/lib/i386/libutil.so.7.18                 base-compat-shlib       compat,pic
+./usr/lib/i386/libutil.so.7.19                 base-compat-shlib       compat,pic
 ./usr/lib/i386/libwind.so.0                    base-compat-shlib       compat,pic,kerberos
 ./usr/lib/i386/libwind.so.0.0                  base-compat-shlib       compat,pic,kerberos
 ./usr/lib/i386/libwrap.so.1                    base-compat-shlib       compat,pic
diff -r 0c59056be4e8 -r 3449251fbb5c distrib/sets/lists/base/md.sparc64
--- a/distrib/sets/lists/base/md.sparc64        Tue Aug 30 12:13:25 2011 +0000
+++ b/distrib/sets/lists/base/md.sparc64        Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.128 2011/08/28 07:48:18 christos Exp $
+# $NetBSD: md.sparc64,v 1.129 2011/08/30 12:39:49 bouyer Exp $
 ./libexec/ld.elf_so-sparc                      base-sysutil-bin        compat,pic
 ./sbin/edlabel                                 base-sysutil-root       obsolete
 ./usr/bin/fdformat                             base-util-bin
@@ -258,7 +258,7 @@
 ./usr/lib/sparc/libusbhid.so.1                 base-compat-shlib       compat,pic
 ./usr/lib/sparc/libusbhid.so.1.0               base-compat-shlib       compat,pic
 ./usr/lib/sparc/libutil.so.7                   base-compat-shlib       compat,pic
-./usr/lib/sparc/libutil.so.7.18                        base-compat-shlib       compat,pic
+./usr/lib/sparc/libutil.so.7.19                        base-compat-shlib       compat,pic
 ./usr/lib/sparc/libwind.so.0                   base-compat-shlib       compat,pic,kerberos
 ./usr/lib/sparc/libwind.so.0.0                 base-compat-shlib       compat,pic,kerberos
 ./usr/lib/sparc/libwrap.so.1                   base-compat-shlib       compat,pic
diff -r 0c59056be4e8 -r 3449251fbb5c distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi    Tue Aug 30 12:13:25 2011 +0000
+++ b/distrib/sets/lists/base/shl.mi    Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.597 2011/08/28 07:48:18 christos Exp $
+# $NetBSD: shl.mi,v 1.598 2011/08/30 12:39:49 bouyer Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -72,7 +72,7 @@
 ./lib/libtermlib.so.0.6                                base-sys-shlib          dynamicroot
 ./lib/libutil.so                               base-sys-shlib          dynamicroot
 ./lib/libutil.so.7                             base-sys-shlib          dynamicroot
-./lib/libutil.so.7.18                          base-sys-shlib          dynamicroot
+./lib/libutil.so.7.19                          base-sys-shlib          dynamicroot
 ./lib/libz.so                                  base-sys-shlib          dynamicroot
 ./lib/libz.so.1                                        base-sys-shlib          dynamicroot
 ./lib/libz.so.1.0                              base-sys-shlib          dynamicroot
@@ -675,7 +675,7 @@
 ./usr/lib/libusbhid.so.1.0                     base-sys-shlib
 ./usr/lib/libutil.so                           base-sys-shlib
 ./usr/lib/libutil.so.7                         base-sys-shlib
-./usr/lib/libutil.so.7.18                      base-sys-shlib
+./usr/lib/libutil.so.7.19                      base-sys-shlib
 ./usr/lib/libuutil.so                          base-zfs-shlib          dynamicroot,zfs
 ./usr/lib/libuutil.so.0                                base-zfs-shlib          dynamicroot,zfs
 ./usr/lib/libuutil.so.0.0                      base-zfs-shlib          zfs,dynamicroot
diff -r 0c59056be4e8 -r 3449251fbb5c distrib/sets/lists/comp/ad.mips64eb
--- a/distrib/sets/lists/comp/ad.mips64eb       Tue Aug 30 12:13:25 2011 +0000
+++ b/distrib/sets/lists/comp/ad.mips64eb       Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.49 2011/08/28 07:48:18 christos Exp $
+# $NetBSD: ad.mips64eb,v 1.50 2011/08/30 12:39:50 bouyer Exp $
 ./usr/bin/elf2aout                             comp-obsolete           obsolete
 ./usr/bin/elf2ecoff                            comp-sysutil-bin
 ./usr/include/gcc-4.5/loongson.h               comp-c-include          gcccmds,gcc=45
@@ -1351,7 +1351,7 @@
 ./usr/libdata/debug/usr/lib/64/libukfs.so.1.0.debug    comp-sys-debug  debug,compat
 ./usr/libdata/debug/usr/lib/64/libumem.so.0.0.debug    comp-zfs-debug  zfs,dynamicroot,debug,compat
 ./usr/libdata/debug/usr/lib/64/libusbhid.so.1.0.debug  comp-sys-debug  debug,compat
-./usr/libdata/debug/usr/lib/64/libutil.so.7.18.debug   comp-sys-debug  debug,compat
+./usr/libdata/debug/usr/lib/64/libutil.so.7.19.debug   comp-sys-debug  debug,compat
 ./usr/libdata/debug/usr/lib/64/libuutil.so.0.0.debug   comp-zfs-debug  zfs,dynamicroot,debug,compat
 ./usr/libdata/debug/usr/lib/64/libwind.so.0.0.debug    comp-compat-shlib        compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/64/libwrap.so.1.0.debug    comp-net-debug  debug,compat
@@ -1500,7 +1500,7 @@
 ./usr/libdata/debug/usr/lib/o32/libukfs.so.1.0.debug   comp-sys-debug  debug,compat
 ./usr/libdata/debug/usr/lib/o32/libumem.so.0.0.debug   comp-zfs-debug  zfs,dynamicroot,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libusbhid.so.1.0.debug comp-sys-debug  debug,compat
-./usr/libdata/debug/usr/lib/o32/libutil.so.7.18.debug  comp-sys-debug  debug,compat
+./usr/libdata/debug/usr/lib/o32/libutil.so.7.19.debug  comp-sys-debug  debug,compat
 ./usr/libdata/debug/usr/lib/o32/libuutil.so.0.0.debug  comp-zfs-debug  zfs,dynamicroot,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libwind.so.0.0.debug           comp-compat-shlib        compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/o32/libwrap.so.1.0.debug   comp-net-debug  debug,compat
diff -r 0c59056be4e8 -r 3449251fbb5c distrib/sets/lists/comp/ad.mips64el
--- a/distrib/sets/lists/comp/ad.mips64el       Tue Aug 30 12:13:25 2011 +0000
+++ b/distrib/sets/lists/comp/ad.mips64el       Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.49 2011/08/28 07:48:18 christos Exp $
+# $NetBSD: ad.mips64el,v 1.50 2011/08/30 12:39:50 bouyer Exp $
 ./usr/bin/elf2aout                             comp-obsolete           obsolete
 ./usr/bin/elf2ecoff                            comp-sysutil-bin
 ./usr/include/gcc-4.5/loongson.h               comp-c-include          gcccmds,gcc=45
@@ -1351,7 +1351,7 @@
 ./usr/libdata/debug/usr/lib/64/libukfs.so.1.0.debug    comp-sys-debug  debug,compat
 ./usr/libdata/debug/usr/lib/64/libumem.so.0.0.debug    comp-zfs-debug  zfs,dynamicroot,debug,compat
 ./usr/libdata/debug/usr/lib/64/libusbhid.so.1.0.debug  comp-sys-debug  debug,compat
-./usr/libdata/debug/usr/lib/64/libutil.so.7.18.debug   comp-sys-debug  debug,compat
+./usr/libdata/debug/usr/lib/64/libutil.so.7.19.debug   comp-sys-debug  debug,compat
 ./usr/libdata/debug/usr/lib/64/libuutil.so.0.0.debug   comp-zfs-debug  zfs,dynamicroot,debug,compat
 ./usr/libdata/debug/usr/lib/64/libwind.so.0.0.debug    comp-compat-shlib        compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/64/libwrap.so.1.0.debug    comp-net-debug  debug,compat
@@ -1500,7 +1500,7 @@
 ./usr/libdata/debug/usr/lib/o32/libukfs.so.1.0.debug   comp-sys-debug  debug,compat
 ./usr/libdata/debug/usr/lib/o32/libumem.so.0.0.debug   comp-zfs-debug  zfs,dynamicroot,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libusbhid.so.1.0.debug comp-sys-debug  debug,compat
-./usr/libdata/debug/usr/lib/o32/libutil.so.7.18.debug  comp-sys-debug  debug,compat
+./usr/libdata/debug/usr/lib/o32/libutil.so.7.19.debug  comp-sys-debug  debug,compat
 ./usr/libdata/debug/usr/lib/o32/libuutil.so.0.0.debug  comp-zfs-debug  zfs,dynamicroot,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libwind.so.0.0.debug           comp-compat-shlib        compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/o32/libwrap.so.1.0.debug   comp-net-debug  debug,compat
diff -r 0c59056be4e8 -r 3449251fbb5c distrib/sets/lists/comp/md.amd64
--- a/distrib/sets/lists/comp/md.amd64  Tue Aug 30 12:13:25 2011 +0000
+++ b/distrib/sets/lists/comp/md.amd64  Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.131 2011/08/28 07:48:18 christos Exp $
+# $NetBSD: md.amd64,v 1.132 2011/08/30 12:39:50 bouyer Exp $
 ./usr/include/amd64                            comp-c-include
 ./usr/include/amd64/ansi.h                     comp-c-include
 ./usr/include/amd64/aout_machdep.h             comp-c-include
@@ -1124,7 +1124,7 @@
 ./usr/libdata/debug/usr/lib/i386/libterminfo.so.1.0.debug      comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libukfs.so.1.0.debug  comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libusbhid.so.1.0.debug        comp-compat-shlib       compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libutil.so.7.18.debug comp-compat-shlib       compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libutil.so.7.19.debug comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libwind.so.0.0.debug  comp-compat-shlib       compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/i386/libwrap.so.1.0.debug  comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libz.so.1.0.debug     comp-compat-shlib       compat,pic,debug
diff -r 0c59056be4e8 -r 3449251fbb5c distrib/sets/lists/comp/md.sparc64
--- a/distrib/sets/lists/comp/md.sparc64        Tue Aug 30 12:13:25 2011 +0000
+++ b/distrib/sets/lists/comp/md.sparc64        Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.116 2011/08/28 07:48:18 christos Exp $
+# $NetBSD: md.sparc64,v 1.117 2011/08/30 12:39:50 bouyer Exp $
 ./usr/include/gcc-4.5/tgmath.h                 comp-c-include          gcccmds,gcc=45
 ./usr/include/ieeefp.h                         comp-c-include
 ./usr/include/sparc                            comp-c-include
@@ -974,7 +974,7 @@
 ./usr/libdata/debug/usr/lib/sparc/libterminfo.so.1.0.debug             comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libukfs.so.1.0.debug                 comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libusbhid.so.1.0.debug               comp-compat-shlib       compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/libutil.so.7.18.debug                        comp-compat-shlib       compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libutil.so.7.19.debug                        comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libwind.so.0.0.debug                 comp-compat-shlib       compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/sparc/libwrap.so.1.0.debug                 comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libz.so.1.0.debug                    comp-compat-shlib       compat,pic,debug
diff -r 0c59056be4e8 -r 3449251fbb5c distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Tue Aug 30 12:13:25 2011 +0000
+++ b/distrib/sets/lists/comp/mi        Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.1667 2011/08/29 16:45:54 njoly Exp $
+#      $NetBSD: mi,v 1.1668 2011/08/30 12:39:50 bouyer Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -6644,6 +6644,7 @@
 ./usr/share/man/cat3/getifaddrs.0              comp-c-catman           .cat
 ./usr/share/man/cat3/getlabeloffset.0          comp-c-catman           .cat
 ./usr/share/man/cat3/getlabelsector.0          comp-c-catman           .cat
+./usr/share/man/cat3/getlabelusesmbr.0         comp-c-catman           .cat
 ./usr/share/man/cat3/getlastlogx.0             comp-c-catman           .cat
 ./usr/share/man/cat3/getline.0                 comp-c-catman           .cat
 ./usr/share/man/cat3/getloadavg.0              comp-c-catman           .cat
@@ -12804,6 +12805,7 @@
 ./usr/share/man/html3/getifaddrs.html          comp-c-htmlman          html
 ./usr/share/man/html3/getlabeloffset.html      comp-c-htmlman          html
 ./usr/share/man/html3/getlabelsector.html      comp-c-htmlman          html
+./usr/share/man/html3/getlabelusesmbr.html     comp-c-htmlman          html
 ./usr/share/man/html3/getlastlogx.html         comp-c-htmlman          html
 ./usr/share/man/html3/getline.html             comp-c-htmlman          html
 ./usr/share/man/html3/getloadavg.html          comp-c-htmlman          html
@@ -18880,6 +18882,7 @@
 ./usr/share/man/man3/getifaddrs.3              comp-c-man              .man
 ./usr/share/man/man3/getlabeloffset.3          comp-c-man              .man
 ./usr/share/man/man3/getlabelsector.3          comp-c-man              .man
+./usr/share/man/man3/getlabelusesmbr.3         comp-c-man              .man
 ./usr/share/man/man3/getlastlogx.3             comp-c-man              .man
 ./usr/share/man/man3/getline.3                 comp-c-man              .man
 ./usr/share/man/man3/getloadavg.3              comp-c-man              .man
diff -r 0c59056be4e8 -r 3449251fbb5c distrib/sets/lists/comp/shl.mi
--- a/distrib/sets/lists/comp/shl.mi    Tue Aug 30 12:13:25 2011 +0000
+++ b/distrib/sets/lists/comp/shl.mi    Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.186 2011/08/28 07:48:18 christos Exp $
+# $NetBSD: shl.mi,v 1.187 2011/08/30 12:39:51 bouyer Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -408,7 +408,7 @@
 ./usr/libdata/debug/usr/lib/libukfs.so.1.0.debug       comp-sys-debug  debug
 ./usr/libdata/debug/usr/lib/libumem.so.0.0.debug       comp-zfs-debug  zfs,dynamicroot,debug
 ./usr/libdata/debug/usr/lib/libusbhid.so.1.0.debug     comp-sys-debug  debug
-./usr/libdata/debug/usr/lib/libutil.so.7.18.debug      comp-sys-debug  debug
+./usr/libdata/debug/usr/lib/libutil.so.7.19.debug      comp-sys-debug  debug
 ./usr/libdata/debug/usr/lib/libuutil.so.0.0.debug      comp-zfs-debug  zfs,dynamicroot,debug
 ./usr/libdata/debug/usr/lib/libwind.so.0.0.debug               comp-krb5-debug kerberos,debug
 ./usr/libdata/debug/usr/lib/libwrap.so.1.0.debug       comp-net-debug  debug
diff -r 0c59056be4e8 -r 3449251fbb5c include/util.h
--- a/include/util.h    Tue Aug 30 12:13:25 2011 +0000
+++ b/include/util.h    Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.h,v 1.58 2011/08/28 07:46:13 christos Exp $       */
+/*     $NetBSD: util.h,v 1.59 2011/08/30 12:39:52 bouyer Exp $ */
 
 /*-
  * Copyright (c) 1995
@@ -70,6 +70,7 @@
 const char     *getbootfile(void);
 off_t          getlabeloffset(void);
 int            getlabelsector(void);
+int            getlabelusesmbr(void);
 int            getmaxpartitions(void);
 int            getrawpartition(void);
 #ifndef __LIBC12_SOURCE__
diff -r 0c59056be4e8 -r 3449251fbb5c lib/libutil/Makefile
--- a/lib/libutil/Makefile      Tue Aug 30 12:13:25 2011 +0000
+++ b/lib/libutil/Makefile      Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.65 2011/08/29 12:37:53 jruoho Exp $
+#      $NetBSD: Makefile,v 1.66 2011/08/30 12:39:52 bouyer Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/4/93
 
 USE_SHLIBDIR=  yes
@@ -38,6 +38,7 @@
 .include "compat/Makefile.inc"
 
 MLINKS+=getlabelsector.3 getlabeloffset.3
+MLINKS+=getlabelsector.3 getlabelusesmbr.3
 MLINKS+=login.3 logout.3
 MLINKS+=login.3 logwtmp.3
 MLINKS+=login_cap.3 login_getclass.3
diff -r 0c59056be4e8 -r 3449251fbb5c lib/libutil/getlabelsector.3
--- a/lib/libutil/getlabelsector.3      Tue Aug 30 12:13:25 2011 +0000
+++ b/lib/libutil/getlabelsector.3      Tue Aug 30 12:39:49 2011 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: getlabelsector.3,v 1.5 2009/06/24 22:31:58 zafer Exp $
+.\"    $NetBSD: getlabelsector.3,v 1.6 2011/08/30 12:39:52 bouyer Exp $
 .\"
 .\"



Home | Main Index | Thread Index | Old Index