error in /etc/rc.d/mdconfig{,2}

[Florent Thoumie]

On Thu, 2006-10-26 at 01:30 +0400, Ruslan Ermilov wrote:
> On Wed, Oct 25, 2006 at 10:44:34PM +0200, Zahemszky G?bor wrote:
> > Hi!
> > 
> > I've just found, that both /etc/rc.d/mdconfig, and /etc/rc.d/mdconfig2
> > file in my 6.2.prerelease (cvsupped yesterday), has an incorrect kldload
> > line:
> > 
> >  kldstat -q -m g_md || kldload geom_md || err 1 "geom_md failed to load."
> > 
> > (mdconfig line 97, and mdconfig2 line 104)
> > 
> > The module name is g_md, and not geom_md.
> > 
> > # $FreeBSD: src/etc/rc.d/mdconfig,v 1.3.2.1 2006/08/21 15:06:38 flz Exp $
> > # $FreeBSD: src/etc/rc.d/mdconfig2,v 1.3.2.1 2006/08/21 15:06:38 flz Exp $
> > 
> True.  In RELENG_6 the module is named g_md.ko, while in HEAD it was
> renamed to geom_md.ko.

Indeed, forgot to change the name, geom_uzip doesn't need to be changed.
Is there a reason why the rename hasn't been MFC'ed? g_md seems to be
the only one not to be named geom_<something>.

Anyway, here's the patch for RELENG_6, is it ok to commit?

Index: mdconfig
===================================================================
RCS file: /home/ncvs/src/etc/rc.d/mdconfig,v
retrieving revision 1.3.2.1
diff -u -r1.3.2.1 mdconfig
--- mdconfig    21 Aug 2006 15:06:38 -0000      1.3.2.1
+++ mdconfig    25 Oct 2006 21:42:22 -0000
@@ -108,7 +108,7 @@
                return
        fi
 
-       kldstat -q -m g_md || kldload geom_md || err 1 "geom_md failed
to load."
+       kldstat -q -m g_md || kldload g_md || err 1 "g_md failed to
load."
 
        for _md in ${_mdconfig_list}; do
                init_variables ${_md}
Index: mdconfig2
===================================================================
RCS file: /home/ncvs/src/etc/rc.d/mdconfig2,v
retrieving revision 1.3.2.1
diff -u -r1.3.2.1 mdconfig2
--- mdconfig2   21 Aug 2006 15:06:38 -0000      1.3.2.1
+++ mdconfig2   25 Oct 2006 21:42:22 -0000
@@ -116,7 +116,7 @@
                return
        fi
 
-       kldstat -q -m g_md || kldload geom_md || err 1 "geom_md failed
to load."
+       kldstat -q -m g_md || kldload g_md || err 1 "g_md failed to
load."
 
        for _md in ${_mdconfig2_list}; do
                init_variables ${_md}

-- 
Florent Thoumie
flz at FreeBSD.org
FreeBSD Committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part
Url : http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20061025/cadd106c/attachment.pgp