Date: Thu, 09 Nov 2006 00:56:50 +0100
From: Claude Buisson <cbuisson@nerim.net>
To: =?ISO-8859-1?Q?Zahemszky_G=E1bor?= <Gabor@Zahemszky.HU>
Cc: freebsd-stable@freebsd.org, Florent Thoumie <flz@FreeBSD.org>
Subject: Re: error in /etc/rc.d/mdconfig{,2}
Message-ID: <45526EC2.4070606@nerim.net>
In-Reply-To: <45525E42.7030904@Zahemszky.HU>
References: <453FCCB2.1090006@Zahemszky.HU> <20061025213019.GB5670@rambler-co.ru> <1161812711.965.6.camel@localhost> <45525E42.7030904@Zahemszky.HU>
next in thread | previous in thread | raw e-mail | index | archive | help
Zahemszky G=E1bor wrote:
> Hi!
>=20
> Two weeks later, this small typo-correction doesn't reach the RELENG_6
> branch. Will it, before src-freeze?
>=20
> Zahy < Gabor at Zahemszky dot HU >
>=20
>> 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/mdconfi=
g2
>>>> file in my 6.2.prerelease (cvsupped yesterday), has an incorrect kld=
load
>>>> line:
>>>>
>>>> kldstat -q -m g_md || kldload geom_md || err 1 "geom_md failed to l=
oad."
>>>>
>>>> (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 change=
d.
>> 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
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>> 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
>> =20
>> - 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."
>> =20
>> for _md in ${_mdconfig_list}; do
>> init_variables ${_md}
>> Index: mdconfig2
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>> 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
>> =20
>> - 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."
>> =20
>> for _md in ${_mdconfig2_list}; do
>> init_variables ${_md}
>>
>=20
>=20
g_md.ko has been renamed geom_md.ko on Sunday, Nov 5.
Have a look at sys/modules/md/Makefile 1.13.8.1
Claude Buisson
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?45526EC2.4070606>