From owner-freebsd-stable@FreeBSD.ORG Wed Oct 25 21:45:24 2006 Return-Path: X-Original-To: freebsd-stable@FreeBSD.org Delivered-To: freebsd-stable@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2393116A403; Wed, 25 Oct 2006 21:45:24 +0000 (UTC) (envelope-from flz@FreeBSD.org) Received: from smtp3-g19.free.fr (smtp3-g19.free.fr [212.27.42.29]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF94743D5A; Wed, 25 Oct 2006 21:45:22 +0000 (GMT) (envelope-from flz@FreeBSD.org) Received: from smtp.xbsd.org (unknown [82.233.2.192]) by smtp3-g19.free.fr (Postfix) with ESMTP id 2640349F1A; Wed, 25 Oct 2006 23:45:20 +0200 (CEST) Received: from localhost (localhost.xbsd.org [127.0.0.1]) by smtp.xbsd.org (Postfix) with ESMTP id E5BF411A84; Wed, 25 Oct 2006 23:45:19 +0200 (CEST) Received: from smtp.xbsd.org ([127.0.0.1]) by localhost (srv1.xbsd.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 78164-01; Wed, 25 Oct 2006 23:45:14 +0200 (CEST) Received: from [193.120.13.130] (cream.xbsd.org [193.120.13.130]) by smtp.xbsd.org (Postfix) with ESMTP id 11FEC11A24; Wed, 25 Oct 2006 23:45:12 +0200 (CEST) From: Florent Thoumie To: Ruslan Ermilov In-Reply-To: <20061025213019.GB5670@rambler-co.ru> References: <453FCCB2.1090006@Zahemszky.HU> <20061025213019.GB5670@rambler-co.ru> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-2cIGPi58zclf1GMYZ2Wr" Date: Wed, 25 Oct 2006 22:45:11 +0100 Message-Id: <1161812711.965.6.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.8.1 FreeBSD GNOME Team Port X-Virus-Scanned: amavisd-new at xbsd.org Cc: Zahemszky G?bor , freebsd-stable@FreeBSD.org Subject: Re: error in /etc/rc.d/mdconfig{,2} X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Oct 2006 21:45:24 -0000 --=-2cIGPi58zclf1GMYZ2Wr Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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! > >=20 > > 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 kldloa= d > > line: > >=20 > > kldstat -q -m g_md || kldload geom_md || err 1 "geom_md failed to load= ." > >=20 > > (mdconfig line 97, and mdconfig2 line 104) > >=20 > > The module name is g_md, and not geom_md. > >=20 > > # $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 Ex= p $ > >=20 > 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_. 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 Florent Thoumie flz@FreeBSD.org FreeBSD Committer --=-2cIGPi58zclf1GMYZ2Wr Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQBFP9rnMxEkbVFH3PQRAiO8AJwI4kpAQ1PZREu5s13sleg39Kvb6wCZAZso gS8qBt5XmtAzkVszOW7ZLnQ= =um66 -----END PGP SIGNATURE----- --=-2cIGPi58zclf1GMYZ2Wr--