From owner-freebsd-rc@FreeBSD.ORG Sun Oct 24 03:26:42 2010 Return-Path: Delivered-To: rc@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AAE9C106564A for ; Sun, 24 Oct 2010 03:26:42 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id 3B68A8FC13 for ; Sun, 24 Oct 2010 03:26:41 +0000 (UTC) Received: by wwb24 with SMTP id 24so2166619wwb.31 for ; Sat, 23 Oct 2010 20:26:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:content-type; bh=3oQH3lVjN70VBKNIiGrZIcRLl3hZqRS29srU7a/FsjM=; b=cbkOqQDHLR4qILiK56yX3WMKI/rjOLoZvsBzWRULlFyHTw1os3bEpJJTvJ80f3g7ZI S37iY0rb0s07j1+qrHX0M/23XlVBq9/aG7YGL13B6Pw3zys3wUGxIWw5K4oRcCqT03up 6MXhaLeYdSRyb8KA/6zRsv+Ahwgq9d077KP/c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type; b=Dh172ffcsH4piYzRBsVwMnrqhW1OXZC5Nhwct1RYa0gxFJrT3voYhxf6405pVvt4en V+TVKF9VqScw9vzLMmGMrUdz7C2h2m27gVZh0Wg7OqQLh1RCVD1rf8kD3ixyttADxSQ4 ATf5EeJbkdPaBbTf0L6vfwEDPqoczrZQpha44= MIME-Version: 1.0 Received: by 10.216.188.197 with SMTP id a47mr4546215wen.70.1287890801179; Sat, 23 Oct 2010 20:26:41 -0700 (PDT) Sender: yanegomi@gmail.com Received: by 10.216.10.198 with HTTP; Sat, 23 Oct 2010 20:26:41 -0700 (PDT) In-Reply-To: References: Date: Sat, 23 Oct 2010 20:26:41 -0700 X-Google-Sender-Auth: gSNYBcnyQS7xPcGkLONm7g5jNzM Message-ID: From: Garrett Cooper To: rc@freebsd.org Content-Type: multipart/mixed; boundary=0016e65684beb6be1504935471ec Cc: Subject: Re: [PATCH] /etc/rc.d/mdconfig improvements X-BeenThere: freebsd-rc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Discussion related to /etc/rc.d design and implementation." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Oct 2010 03:26:42 -0000 --0016e65684beb6be1504935471ec Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On Sun, Oct 10, 2010 at 8:48 PM, Garrett Cooper wrote= : > Hi RC folks, > =A0 =A0I was looking at /etc/rc.d/mdconfig* recently, and I thought of > two improvements that could be done to the scripts: > =A0 =A01. It's not overly intuitive from the rc.conf manpage that the > memory disks need to be defined in /etc/fstab, so I added an error to > coach people on what to do > =A0 =A02. There was also a missing guard for around a ${_file} reference > where if I did... > > /dev/md0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/scratch =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0cd9660 =A0 =A0 rw > =A0 =A00 =A0 =A0 =A0 0 > /dev/md1 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/scratch2 =A0 =A0 =A0 =A0 =A0 =A0= =A0ufs =A0 =A0 rw =A0 =A0 =A0 =A0 =A0 =A0 =A00 =A0 =A0 =A0 0 > > mdconfig_md0=3D"-f /scratch/disk.img -t vnode" > mdconfig_md1=3D"-t swap -s 1M" > > =A0 =A0... it would check test for ${_file} twice and fail the second > time. The check is benign in most cases, but for completeness it > should be fixed as shown above. > =A0 =A0Could someone please commit the attached patch for me, if no one > objects to the change proposed? (Resending with a .patch extension just in case) Does anyone have any comments about the attached patch? Thanks! -Garrett --0016e65684beb6be1504935471ec Content-Type: text/x-patch; charset=US-ASCII; name="etc-rc.d-mdconfig-improvements.patch" Content-Disposition: attachment; filename="etc-rc.d-mdconfig-improvements.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gfnctvly1 SW5kZXg6IGV0Yy9yYy5kL21kY29uZmlnCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGV0Yy9yYy5kL21kY29uZmln CShyZXZpc2lvbiAyMTM2ODApCisrKyBldGMvcmMuZC9tZGNvbmZpZwkod29ya2luZyBjb3B5KQpA QCAtMTQ2LDYgKzE0Niw4IEBACiAJCQlpZiBtb3VudCAtZCAke19kZXZ9IDI+JjEgPi9kZXYvbnVs bDsgdGhlbgogCQkJCWVjaG8gIk1vdW50aW5nICR7X2Rldn0uIgogCQkJCW1vdW50ICR7X2Rldn0K KwkJCWVsc2UKKwkJCQllcnIgMSAiTW91bnRwb2ludCBmb3IgJHtfZGV2fSBub3QgZGVmaW5lZCBp biAvZXRjL2ZzdGFiIgogCQkJZmkKIAkJZmkKIAlkb25lCkluZGV4OiBldGMvcmMuZC9tZGNvbmZp ZzIKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gZXRjL3JjLmQvbWRjb25maWcyCShyZXZpc2lvbiAyMTM2ODApCisr KyBldGMvcmMuZC9tZGNvbmZpZzIJKHdvcmtpbmcgY29weSkKQEAgLTExMyw5ICsxMTMsMTEgQEAK IAogCWZvciBfbWQgaW4gJHtfbWRjb25maWcyX2xpc3R9OyBkbwogCQlpbml0X3ZhcmlhYmxlcyAk e19tZH0KLQkJaWYgWyAhIC1yICR7X2ZpbGV9IF07IHRoZW4KLQkJCWVyciAzICIke19maWxlfSBk b2Vzbid0IGV4aXN0IgotCQkJY29udGludWUKKwkJaWYgWyAiJHt0eXBlfSIgPSAidm5vZGUiIF07 IHRoZW4KKwkJCWlmIFsgISAtciAiJHtfZmlsZX0iIF07IHRoZW4KKwkJCQllcnIgMyAiJHtfZmls ZX0gZG9lc24ndCBleGlzdCIKKwkJCQljb250aW51ZQorCQkJZmkKIAkJZmkKIAkJIyBGaXJzdCBw YXNzOiBjcmVhdGUgbWQoNCkgdm5vZGUgZGV2aWNlcyBmcm9tIGZpbGVzIHN0b3JlZCBvbgogCQkj IG5vbi1yb290IHBhcnRpdGlvbi4gU3dhcCBhbmQgbWFsbG9jIG1kKDQpIGRldmljZXMgaGF2ZSBh bHJlYWR5Cg== --0016e65684beb6be1504935471ec--