Date: Mon, 10 Oct 2005 09:37:49 -0700 (PDT) From: David Wolfskill <david@catwhisker.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: yar@FreeBSD.org Subject: bin/87218: Please MFC (to RELENG_5) changes to /etc/rc.subr and /etc/defaults/rc.conf Message-ID: <200510101637.j9AGbnk8058767@bunrab.catwhisker.org> Resent-Message-ID: <200510101640.j9AGeELv004297@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 87218 >Category: bin >Synopsis: Please MFC (to RELENG_5) changes to /etc/rc.subr and /etc/defaults/rc.conf >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 10 16:40:14 GMT 2005 >Closed-Date: >Last-Modified: >Originator: David Wolfskill >Release: FreeBSD 5.4-STABLE i386 >Organization: Wolfskill & Dowling Residence >Environment: System: FreeBSD g1-18.catwhisker.org. 5.4-STABLE FreeBSD 5.4-STABLE #622: Mon Oct 10 07:48:53 PDT 2005 root@g1-18.catwhisker.org.:/common/S2/obj/usr/src/sys/LAPTOP_30W i386 >Description: On 24 Aug 2005 16:25:47 +0000 (UTC), Yar Tikhiy <yar@FreeBSD.org> committed a change to src/etc/rc.subr (1.37) and src/etc/defaults/rc.conf (1.259) to move the "-M" flag for the mdmfs invocation from the mount_md() function in rc.subr to the tmpmfs_flags and varmfs_flags in defaults/rc.conf. That change was MFCed to RELENG_6 by Yar on 2005-08-28 09:08:06 UTC. I am asking that it also be MFCed to RELENG_5, which suffers from the same problem. (RELENG_4 does not, however, so I am not requesting that.) The incident that catalyzed this PR is documented was described in a message posted to freebsd-stable, and may be found at <http://docs.FreeBSD.org/cgi/mid.cgi?20051010020729.GA56351>. >How-To-Repeat: See <http://docs.FreeBSD.org/cgi/mid.cgi?20051010020729.GA56351>. And yes, I've tested the fix/MFC under RELENG_5. With the below fix implemented , the machine under test (ref the "uname -a" output above) survived being a CVS server while a CVS client did a "cvs update" on /usr/ports -- while the machine under test was also updating a RELENG_6 /usr/src at the same time. I try to get some use out of a laptop. >Fix: Index: rc.subr =================================================================== RCS file: /cvs/freebsd/src/etc/rc.subr,v retrieving revision 1.31.2.1 diff -u -r1.31.2.1 rc.subr --- rc.subr 17 Jan 2005 11:51:00 -0000 1.31.2.1 +++ rc.subr 10 Oct 2005 16:32:42 -0000 @@ -1294,7 +1294,7 @@ if [ -n "$3" ]; then flags="$3" fi - /sbin/mdmfs $flags -s $1 -M md $2 + /sbin/mdmfs $flags -s $1 md $2 } fi Index: defaults/rc.conf =================================================================== RCS file: /cvs/freebsd/src/etc/defaults/rc.conf,v retrieving revision 1.212.2.19 diff -u -r1.212.2.19 rc.conf --- defaults/rc.conf 25 Sep 2005 19:06:24 -0000 1.212.2.19 +++ defaults/rc.conf 10 Oct 2005 16:33:07 -0000 @@ -44,10 +44,10 @@ removable_interfaces="" # Removable network interfaces for /etc/pccard_ether. tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never tmpsize="20m" # Size of mfs /tmp if created -tmpmfs_flags="-S" # Extra mdmfs options for the mfs /tmp +tmpmfs_flags="-S -M" # Extra mdmfs options for the mfs /tmp varmfs="AUTO" # Set to YES to always create an mfs /var, NO to never varsize="32m" # Size of mfs /var if created -varmfs_flags="-S" # Extra mount options for the mfs /var +varmfs_flags="-S -M" # Extra mount options for the mfs /var populate_var="AUTO" # Set to YES to always (re)populate /var, NO to never local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. script_name_sep=" " # Change if your startup scripts' names contain spaces >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510101637.j9AGbnk8058767>