From owner-freebsd-stable@FreeBSD.ORG Wed Nov 8 22:46:35 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 B7F0D16A4B3; Wed, 8 Nov 2006 22:46:35 +0000 (UTC) (envelope-from Gabor@Zahemszky.HU) Received: from mta05.mail.t-online.hu (mta05.mail.t-online.hu [195.228.240.88]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F5C643D6B; Wed, 8 Nov 2006 22:46:34 +0000 (GMT) (envelope-from Gabor@Zahemszky.HU) Received: from [192.168.1.2] (dsl51B6157B.pool.t-online.hu [81.182.21.123]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.t-online.hu (Postfix) with ESMTP; Wed, 8 Nov 2006 23:46:32 +0100 (CET) Message-ID: <45525E42.7030904@Zahemszky.HU> Date: Wed, 08 Nov 2006 23:46:26 +0100 From: =?ISO-8859-2?Q?Zahemszky_G=E1bor?= User-Agent: Thunderbird 1.5.0.7 (X11/20061024) MIME-Version: 1.0 To: Florent Thoumie , freebsd-stable@freebsd.org References: <453FCCB2.1090006@Zahemszky.HU> <20061025213019.GB5670@rambler-co.ru> <1161812711.965.6.camel@localhost> In-Reply-To: <1161812711.965.6.camel@localhost> Content-Type: text/plain; charset=ISO-8859-2 Content-Transfer-Encoding: 7bit Cc: 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, 08 Nov 2006 22:46:35 -0000 Hi! Two weeks later, this small typo-correction doesn't reach the RELENG_6 branch. Will it, before src-freeze? Zahy < Gabor at Zahemszky dot HU > > 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_. > > 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} > -- #!/bin/ksh Z='21N16I25C25E30, 40M30E33E25T15U!';IFS=' ABCDEFGHIJKLMNOPQRSTUVWXYZ ';set -- $Z;for i;{ [[ $i = ? ]]&&print $i&&break;[[ $i = ??? ]]&&j=$i&&i=${i%?};typeset -i40 i=8#$i;print -n ${i#???};[[ "$j" = ??? ]]&&print -n "${j#??} "&&j=;typeset +i i;};IFS=' 0123456789 ';set -- $Z;for i;{ [[ $i = , ]]&&i=2;[[ $i = ?? ]]||typeset -l i;j="$j $i";typeset +l i;};print "$j"