From owner-freebsd-rc@FreeBSD.ORG Sun Jun 12 19:20:15 2005 Return-Path: X-Original-To: freebsd-rc@freebsd.org Delivered-To: freebsd-rc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16DA216A41C for ; Sun, 12 Jun 2005 19:20:15 +0000 (GMT) (envelope-from DougB@freebsd.org) Received: from rwcrmhc14.comcast.net (rwcrmhc14.comcast.net [216.148.227.89]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC4AD43D49 for ; Sun, 12 Jun 2005 19:20:14 +0000 (GMT) (envelope-from DougB@freebsd.org) Received: from [192.168.15.101] (67-20-70-103.vnnyca.adelphia.net[67.20.70.103]) by comcast.net (rwcrmhc14) with SMTP id <20050612192013014001oba2e>; Sun, 12 Jun 2005 19:20:13 +0000 Date: Sun, 12 Jun 2005 12:20:02 -0700 (PDT) From: Doug Barton To: Brooks Davis In-Reply-To: <20050609210223.GB16168@odin.ac.hmc.edu> Message-ID: <20050612121504.K844@ync.qbhto.arg> References: <20050607033536.GH37208@linwhf.opal.com> <20050607160855.GO37208@linwhf.opal.com> <20050607173741.GI11758@odin.ac.hmc.edu> <20050607191109.GU37208@linwhf.opal.com> <20050608233802.GA29707@odin.ac.hmc.edu> <20050609003459.GK37208@linwhf.opal.com> <20050609050517.GA28710@odin.ac.hmc.edu> <42A89CD7.1080404@FreeBSD.org> <20050609201017.GA10248@odin.ac.hmc.edu> <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> Organization: http://www.FreeBSD.org/ X-OpenPGP-Key-ID: 0xD5B2F0FB X-message-flag: Outlook -- Not just for spreading viruses anymore! MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="0-68652384-1118604002=:844" Cc: freebsd-rc@FreeBSD.org, "J.R. Oldroyd" Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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, 12 Jun 2005 19:20:15 -0000 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-68652384-1118604002=:844 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Ok, here is a patch. Sorry it took so long to get to this, but real life interfered. I used JR's latest localpkg patch intact, and modified part of his rc patch to get that working. I'm not tied to either of the keywords I chose, bootearly and PORTS_RCORDER, so if someone has a better idea don't hesitate. To determine what to include in bootearly I used the extremely unscientific method of running rcorder the way it was pre-patch, and adding the keyword to all the scripts up to and including mountcritremote. This works in the sense that it boots my system exactly the way that it did before, but some more careful thought could probably be applied here by someone who knows the ins and outs of diskless booting (Brooks?). I'll let this sit till Monday, since re@ has indicated that they are flexible on some of these things, and I'd rather give you guys some time to review it. Doug -- This .signature sanitized for your protection --0-68652384-1118604002=:844 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=rc-local.diff Content-Transfer-Encoding: BASE64 Content-ID: <20050612122002.R844@ync.qbhto.arg> Content-Description: Content-Disposition: attachment; filename=rc-local.diff SW5kZXg6IHJjDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTog L2hvbWUvbmN2cy9zcmMvZXRjL3JjLHYNCnJldHJpZXZpbmcgcmV2aXNpb24g MS4zMzYNCmRpZmYgLXUgLXIxLjMzNiByYw0KLS0tIHJjCTI5IEFwciAyMDA1 IDIzOjAyOjU2IC0wMDAwCTEuMzM2DQorKysgcmMJMTIgSnVuIDIwMDUgMTk6 MTA6MjIgLTAwMDANCkBAIC01Myw3ICs1Myw3IEBADQogLiAvZXRjL3JjLnN1 YnINCiANCiAjIE5vdGU6IHRoZSBzeXN0ZW0gY29uZmlndXJhdGlvbiBmaWxl cyBhcmUgbG9hZGVkIGFzIHBhcnQgb2YNCi0jIHRoZSBSQ05HIHN5c3RlbSAo cmMuZC9yY2NvbmYuc2gpLiAgRG8gbm90IGxvYWQgdGhlbSBoZXJlIGFzIGl0 IG1heQ0KKyMgdGhlIHJjLmQgc3lzdGVtIChyYy5kL3JjY29uZi5zaCkuICBE byBub3QgbG9hZCB0aGVtIGhlcmUgYXMgaXQgbWF5DQogIyBpbnRlcmZlcmUg d2l0aCBkaXNrbGVzcyBib290aW5nLg0KICMNCiBpZiBbICIkMSIgPSBhdXRv Ym9vdCBdOyB0aGVuDQpAQCAtNzIsNyArNzIsNDIgQEANCiANCiBza2lwPSIt cyBub3N0YXJ0Ig0KIFsgYC9zYmluL3N5c2N0bCAtbiBzZWN1cml0eS5qYWls LmphaWxlZGAgLWVxIDEgXSAmJiBza2lwPSIkc2tpcCAtcyBub2phaWwiDQot ZmlsZXM9YHJjb3JkZXIgJHtza2lwfSAvZXRjL3JjLmQvKiAyPi9kZXYvbnVs bGANCisNCisjIERvIGEgZmlyc3QgcGFzcyB0byBnZXQgZXZlcnl0aGluZyB1 cCB0byBtb3VudGNyaXRyZW1vdGUNCisjIHNvIHRoYXQgd2UgY2FuIGRvIGEg c2Vjb25kIHBhc3MgdGhhdCBpbmNsdWRlcyAvdXNyL2xvY2FsDQorIw0KK2Zp bGVzPWByY29yZGVyICR7c2tpcH0gLWsgYm9vdGVhcmx5IC9ldGMvcmMuZC8q IDI+L2Rldi9udWxsYA0KKw0KK2ZvciBfcmNfZWxlbSBpbiAke2ZpbGVzfTsg ZG8NCisJcnVuX3JjX3NjcmlwdCAke19yY19lbGVtfSAke19ib290fQ0KK2Rv bmUNCisNCit1bnNldCBmaWxlcw0KKw0KKyMgTm93IHRoYXQgZGlza3MgYXJl IG1vdW50ZWQsIGZvciBlYWNoIGRpciBpbiAkbG9jYWxfc3RhcnR1cCBzZWFy Y2gNCisjIGZvciBpbml0IHNjcmlwdHMgdGhhdCBkbyBub3QgdXNlIHRoZSBv bGQgKi5zaCBmaWxlIHBhdHRlcm4NCisjIGFuZCBkbyBoYXZlIHRoZSBuZXcg a2V5d29yZCBpbiB0aGVtLg0KKyMNCitjYXNlICR7bG9jYWxfc3RhcnR1cH0g aW4NCitbTm5dW09vXSB8ICcnKSA7Ow0KKyopCWxvY2FsX3JjPSIiDQorCWZv ciBkaXIgaW4gJHtsb2NhbF9zdGFydHVwfTsgZG8NCisJCWlmIFsgLWQgIiR7 ZGlyfSIgXTsgdGhlbg0KKwkJCWZvciBmaWxlIGluIGBncmVwIC1sIFBPUlRT X1JDT1JERVIgJHtkaXJ9LypgOyBkbw0KKwkJCQljYXNlICIkZmlsZSIgaW4N CisJCQkJKi5zaHwqLnNhbXBsZSkgOzsNCisJCQkJKikJaWYgWyAteCAiJGZp bGUiIF07IHRoZW4NCisJCQkJCQlsb2NhbF9yYz0iJHtsb2NhbF9yY30gJHtm aWxlfSINCisJCQkJCWZpDQorCQkJCQk7Ow0KKwkJCQllc2FjDQorCQkJZG9u ZQ0KKwkJZmkNCisJZG9uZQ0KKwk7Ow0KK2VzYWMNCisNCitmaWxlcz1gcmNv cmRlciAke3NraXB9IC1zIGJvb3RlYXJseSAvZXRjL3JjLmQvKiAke2xvY2Fs X3JjfSAyPi9kZXYvbnVsbGANCiANCiBmb3IgX3JjX2VsZW0gaW4gJHtmaWxl c307IGRvDQogCXJ1bl9yY19zY3JpcHQgJHtfcmNfZWxlbX0gJHtfYm9vdH0N CkluZGV4OiByYy5kL05FVFdPUktJTkcNCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0NClJDUyBmaWxlOiAvaG9tZS9uY3ZzL3NyYy9ldGMvcmMuZC9ORVRXT1JL SU5HLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS45DQpkaWZmIC11IC1yMS45 IE5FVFdPUktJTkcNCi0tLSByYy5kL05FVFdPUktJTkcJNyBPY3QgMjAwNCAx Mzo1NToyNSAtMDAwMAkxLjkNCisrKyByYy5kL05FVFdPUktJTkcJMTIgSnVu IDIwMDUgMTk6MTA6MjIgLTAwMDANCkBAIC03LDYgKzcsNyBAQA0KICMgUFJP VklERTogTkVUV09SS0lORyBORVRXT1JLDQogIyBSRVFVSVJFOiBkaGNsaWVu dCBuZXRpZiByb3V0aW5nIG5ldHdvcmtfaXB2NiBpc2RuZCBwcHAtdXNlcg0K ICMgUkVRVUlSRTogcm91dGVkIG1yb3V0ZWQgcm91dGU2ZCBtcm91dGU2ZA0K KyMgS0VZV09SRDogYm9vdGVhcmx5DQogDQogIwlUaGlzIGlzIGEgZHVtbXkg ZGVwZW5kZW5jeSwgZm9yIHNlcnZpY2VzIHdoaWNoIHJlcXVpcmUgbmV0d29y a2luZw0KICMJdG8gYmUgb3BlcmF0aW9uYWwgYmVmb3JlIHN0YXJ0aW5nLg0K SW5kZXg6IHJjLmQvYWRkc3dhcA0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K UkNTIGZpbGU6IC9ob21lL25jdnMvc3JjL2V0Yy9yYy5kL2FkZHN3YXAsdg0K cmV0cmlldmluZyByZXZpc2lvbiAxLjQNCmRpZmYgLXUgLXIxLjQgYWRkc3dh cA0KLS0tIHJjLmQvYWRkc3dhcAk3IE9jdCAyMDA0IDEzOjU1OjI1IC0wMDAw CTEuNA0KKysrIHJjLmQvYWRkc3dhcAkxMiBKdW4gMjAwNSAxOToxMDoyMiAt MDAwMA0KQEAgLTgsNyArOCw3IEBADQogIyBQUk9WSURFOiBhZGRzd2FwDQog IyBSRVFVSVJFOiBtb3VudGNyaXRsb2NhbA0KICMgQkVGT1JFOiBzeXNjdGwN Ci0jIEtFWVdPUkQ6IG5vamFpbA0KKyMgS0VZV09SRDogbm9qYWlsIGJvb3Rl YXJseQ0KIA0KIC4gL2V0Yy9yYy5zdWJyDQogDQpJbmRleDogcmMuZC9hZGpr ZXJudHoNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvaG9t ZS9uY3ZzL3NyYy9ldGMvcmMuZC9hZGprZXJudHosdg0KcmV0cmlldmluZyBy ZXZpc2lvbiAxLjUNCmRpZmYgLXUgLXIxLjUgYWRqa2VybnR6DQotLS0gcmMu ZC9hZGprZXJudHoJNyBPY3QgMjAwNCAxMzo1NToyNSAtMDAwMAkxLjUNCisr KyByYy5kL2Fkamtlcm50egkxMiBKdW4gMjAwNSAxOToxMDoyMiAtMDAwMA0K QEAgLTYsNyArNiw3IEBADQogIyBQUk9WSURFOiBhZGprZXJudHoNCiAjIFJF UVVJUkU6IG1vdW50Y3JpdGxvY2FsIHJhbmRvbQ0KICMgQkVGT1JFOiBuZXRp Zg0KLSMgS0VZV09SRDogbm9qYWlsDQorIyBLRVlXT1JEOiBub2phaWwgYm9v dGVhcmx5DQogDQogLiAvZXRjL3JjLnN1YnINCiANCkluZGV4OiByYy5kL2F0 bTENCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvaG9tZS9u Y3ZzL3NyYy9ldGMvcmMuZC9hdG0xLHYNCnJldHJpZXZpbmcgcmV2aXNpb24g MS4xNQ0KZGlmZiAtdSAtcjEuMTUgYXRtMQ0KLS0tIHJjLmQvYXRtMQk3IE9j dCAyMDA0IDEzOjU1OjI1IC0wMDAwCTEuMTUNCisrKyByYy5kL2F0bTEJMTIg SnVuIDIwMDUgMTk6MTA6MjIgLTAwMDANCkBAIC0zMCw3ICszMCw3IEBADQog IyBQUk9WSURFOiBhdG0xDQogIyBSRVFVSVJFOiByb290DQogIyBCRUZPUkU6 IG5ldGlmDQotIyBLRVlXT1JEOiBub2phaWwNCisjIEtFWVdPUkQ6IG5vamFp bCBib290ZWFybHkNCiANCiAuIC9ldGMvcmMuc3Vicg0KIA0KSW5kZXg6IHJj LmQvYXRtMg0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9o b21lL25jdnMvc3JjL2V0Yy9yYy5kL2F0bTIsdg0KcmV0cmlldmluZyByZXZp c2lvbiAxLjE2DQpkaWZmIC11IC1yMS4xNiBhdG0yDQotLS0gcmMuZC9hdG0y CTcgT2N0IDIwMDQgMTM6NTU6MjUgLTAwMDAJMS4xNg0KKysrIHJjLmQvYXRt MgkxMiBKdW4gMjAwNSAxOToxMDoyMiAtMDAwMA0KQEAgLTMwLDcgKzMwLDcg QEANCiAjIFBST1ZJREU6IGF0bTINCiAjIFJFUVVJUkU6IGF0bTEgbmV0aWYN CiAjIEJFRk9SRTogIHJvdXRpbmcNCi0jIEtFWVdPUkQ6IG5vamFpbA0KKyMg S0VZV09SRDogbm9qYWlsIGJvb3RlYXJseQ0KIA0KICMNCiAjIEFkZGl0aW9u YWwgQVRNIGludGVyZmFjZSBjb25maWd1cmF0aW9uDQpJbmRleDogcmMuZC9j Y2QNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvaG9tZS9u Y3ZzL3NyYy9ldGMvcmMuZC9jY2Qsdg0KcmV0cmlldmluZyByZXZpc2lvbiAx LjUNCmRpZmYgLXUgLXIxLjUgY2NkDQotLS0gcmMuZC9jY2QJNyBPY3QgMjAw NCAxMzo1NToyNSAtMDAwMAkxLjUNCisrKyByYy5kL2NjZAkxMiBKdW4gMjAw NSAxOToxMDoyMiAtMDAwMA0KQEAgLTUsNyArNSw3IEBADQogIw0KIA0KICMg UFJPVklERTogZGlza3MNCi0jIEtFWVdPUkQ6IG5vamFpbA0KKyMgS0VZV09S RDogbm9qYWlsIGJvb3RlYXJseQ0KIA0KIC4gL2V0Yy9yYy5zdWJyDQogDQpJ bmRleDogcmMuZC9jbGVhbnZhcg0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K UkNTIGZpbGU6IC9ob21lL25jdnMvc3JjL2V0Yy9yYy5kL2NsZWFudmFyLHYN CnJldHJpZXZpbmcgcmV2aXNpb24gMS44DQpkaWZmIC11IC1yMS44IGNsZWFu dmFyDQotLS0gcmMuZC9jbGVhbnZhcgkxNCBBcHIgMjAwNSAwMzo1NjowNiAt MDAwMAkxLjgNCisrKyByYy5kL2NsZWFudmFyCTEyIEp1biAyMDA1IDE5OjEw OjIyIC0wMDAwDQpAQCAtNSw2ICs1LDcgQEANCiANCiAjIFBST1ZJREU6IGNs ZWFudmFyDQogIyBSRVFVSVJFOiBtb3VudGNyaXRsb2NhbCB2YXINCisjIEtF WVdPUkQ6IGJvb3RlYXJseQ0KIA0KIHB1cmdlZGlyKCkNCiB7DQpJbmRleDog cmMuZC9kZXZkDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTog L2hvbWUvbmN2cy9zcmMvZXRjL3JjLmQvZGV2ZCx2DQpyZXRyaWV2aW5nIHJl dmlzaW9uIDEuNw0KZGlmZiAtdSAtcjEuNyBkZXZkDQotLS0gcmMuZC9kZXZk CTcgT2N0IDIwMDQgMTM6NTU6MjUgLTAwMDAJMS43DQorKysgcmMuZC9kZXZk CTEyIEp1biAyMDA1IDE5OjEwOjIyIC0wMDAwDQpAQCAtNiw3ICs2LDcgQEAN CiAjIFBST1ZJREU6IGRldmQNCiAjIFJFUVVJUkU6IE5FVFdPUktJTkcNCiAj IEJFRk9SRTogbW91bnRjcml0cmVtb3RlDQotIyBLRVlXT1JEOiBub2phaWwN CisjIEtFWVdPUkQ6IG5vamFpbCBib290ZWFybHkNCiANCiAuIC9ldGMvcmMu c3Vicg0KIA0KSW5kZXg6IHJjLmQvZHVtcG9uDQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvbmN2cy9zcmMvZXRjL3JjLmQvZHVt cG9uLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS45DQpkaWZmIC11IC1yMS45 IGR1bXBvbg0KLS0tIHJjLmQvZHVtcG9uCTcgSnVuIDIwMDUgMTU6MjA6MTAg LTAwMDAJMS45DQorKysgcmMuZC9kdW1wb24JMTIgSnVuIDIwMDUgMTk6MTA6 MjIgLTAwMDANCkBAIC02LDcgKzYsNyBAQA0KICMgUFJPVklERTogZHVtcG9u DQogIyBSRVFVSVJFOiByY2NvbmYNCiAjIEJFRk9SRTogZGlza3Mgc2F2ZWNv cmUgaW5pdHJhbmRvbQ0KLSMgS0VZV09SRDogbm9qYWlsDQorIyBLRVlXT1JE OiBub2phaWwgYm9vdGVhcmx5DQogDQogLiAvZXRjL3JjLnN1YnINCiANCklu ZGV4OiByYy5kL2Vhcmx5LnNoDQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpS Q1MgZmlsZTogL2hvbWUvbmN2cy9zcmMvZXRjL3JjLmQvZWFybHkuc2gsdg0K cmV0cmlldmluZyByZXZpc2lvbiAxLjINCmRpZmYgLXUgLXIxLjIgZWFybHku c2gNCi0tLSByYy5kL2Vhcmx5LnNoCTcgT2N0IDIwMDQgMTM6NTU6MjUgLTAw MDAJMS4yDQorKysgcmMuZC9lYXJseS5zaAkxMiBKdW4gMjAwNSAxOToxMDoy MiAtMDAwMA0KQEAgLTYsNiArNiw3IEBADQogIyBQUk9WSURFOiBlYXJseQ0K ICMgUkVRVUlSRTogZGlza3MgbG9jYWxzd2FwDQogIyBCRUZPUkU6ICBmc2Nr DQorIyBLRVlXT1JEOiBib290ZWFybHkNCiANCiAjDQogIyBTdXBwb3J0IGZv ciBsZWdhY3kgL2V0Yy9yYy5lYXJseSBzY3JpcHQNCkluZGV4OiByYy5kL2Zz Y2sNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvaG9tZS9u Y3ZzL3NyYy9ldGMvcmMuZC9mc2NrLHYNCnJldHJpZXZpbmcgcmV2aXNpb24g MS4xMA0KZGlmZiAtdSAtcjEuMTAgZnNjaw0KLS0tIHJjLmQvZnNjawk3IE9j dCAyMDA0IDEzOjU1OjI1IC0wMDAwCTEuMTANCisrKyByYy5kL2ZzY2sJMTIg SnVuIDIwMDUgMTk6MTA6MjIgLTAwMDANCkBAIC02LDcgKzYsNyBAQA0KIA0K ICMgUFJPVklERTogZnNjaw0KICMgUkVRVUlSRTogbG9jYWxzd2FwDQotIyBL RVlXT1JEOiBub2phaWwNCisjIEtFWVdPUkQ6IG5vamFpbCBib290ZWFybHkN CiANCiAuIC9ldGMvcmMuc3Vicg0KIA0KSW5kZXg6IHJjLmQvZ2JkZQ0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9ob21lL25jdnMvc3Jj L2V0Yy9yYy5kL2diZGUsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjEyDQpk aWZmIC11IC1yMS4xMiBnYmRlDQotLS0gcmMuZC9nYmRlCTMwIEphbiAyMDA1 IDExOjA0OjEzIC0wMDAwCTEuMTINCisrKyByYy5kL2diZGUJMTIgSnVuIDIw MDUgMTk6MTA6MjIgLTAwMDANCkBAIC03LDcgKzcsNyBAQA0KICMNCiANCiAj IFBST1ZJREU6IGRpc2tzDQotIyBLRVlXT1JEOiBub2phaWwNCisjIEtFWVdP UkQ6IG5vamFpbCBib290ZWFybHkNCiANCiAuIC9ldGMvcmMuc3Vicg0KIA0K SW5kZXg6IHJjLmQvZ2JkZV9zd2FwDQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 DQpSQ1MgZmlsZTogL2hvbWUvbmN2cy9zcmMvZXRjL3JjLmQvZ2JkZV9zd2Fw LHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS42DQpkaWZmIC11IC1yMS42IGdi ZGVfc3dhcA0KLS0tIHJjLmQvZ2JkZV9zd2FwCTcgT2N0IDIwMDQgMTM6NTU6 MjUgLTAwMDAJMS42DQorKysgcmMuZC9nYmRlX3N3YXAJMTIgSnVuIDIwMDUg MTk6MTA6MjIgLTAwMDANCkBAIC01LDcgKzUsNyBAQA0KIA0KICMgUFJPVklE RTogZGlza3MNCiAjIFJFUVVJUkU6IGluaXRyYW5kb20NCi0jIEtFWVdPUkQ6 IG5vamFpbA0KKyMgS0VZV09SRDogbm9qYWlsIGJvb3RlYXJseQ0KIA0KIC4g L2V0Yy9yYy5zdWJyDQogDQpJbmRleDogcmMuZC9ob3N0bmFtZQ0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9ob21lL25jdnMvc3JjL2V0 Yy9yYy5kL2hvc3RuYW1lLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS44DQpk aWZmIC11IC1yMS44IGhvc3RuYW1lDQotLS0gcmMuZC9ob3N0bmFtZQk3IE9j dCAyMDA0IDEzOjU1OjI1IC0wMDAwCTEuOA0KKysrIHJjLmQvaG9zdG5hbWUJ MTIgSnVuIDIwMDUgMTk6MTA6MjIgLTAwMDANCkBAIC0yOSw2ICsyOSw3IEBA DQogIyBQUk9WSURFOiBob3N0bmFtZQ0KICMgUkVRVUlSRTogbW91bnRjcml0 bG9jYWwNCiAjIEJFRk9SRTogIG5ldGlmDQorIyBLRVlXT1JEOiBib290ZWFy bHkNCiANCiAuIC9ldGMvcmMuc3Vicg0KIA0KSW5kZXg6IHJjLmQvaW5pdHJh bmRvbQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9ob21l L25jdnMvc3JjL2V0Yy9yYy5kL2luaXRyYW5kb20sdg0KcmV0cmlldmluZyBy ZXZpc2lvbiAxLjUNCmRpZmYgLXUgLXIxLjUgaW5pdHJhbmRvbQ0KLS0tIHJj LmQvaW5pdHJhbmRvbQkyIE1hciAyMDA1IDE5OjAzOjA4IC0wMDAwCTEuNQ0K KysrIHJjLmQvaW5pdHJhbmRvbQkxMiBKdW4gMjAwNSAxOToxMDoyMiAtMDAw MA0KQEAgLTYsNyArNiw3IEBADQogIyBQUk9WSURFOiBpbml0cmFuZG9tDQog IyBSRVFVSVJFOiByY2NvbmYNCiAjIEJFRk9SRTogZGlza3MNCi0jIEtFWVdP UkQ6IG5vamFpbA0KKyMgS0VZV09SRDogbm9qYWlsIGJvb3RlYXJseQ0KIA0K IC4gL2V0Yy9yYy5zdWJyDQogDQpJbmRleDogcmMuZC9pcDZhZGRyY3RsDQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvbmN2cy9z cmMvZXRjL3JjLmQvaXA2YWRkcmN0bCx2DQpyZXRyaWV2aW5nIHJldmlzaW9u IDEuNA0KZGlmZiAtdSAtcjEuNCBpcDZhZGRyY3RsDQotLS0gcmMuZC9pcDZh ZGRyY3RsCTcgT2N0IDIwMDQgMTM6NTU6MjYgLTAwMDAJMS40DQorKysgcmMu ZC9pcDZhZGRyY3RsCTEyIEp1biAyMDA1IDE5OjEwOjIyIC0wMDAwDQpAQCAt Niw3ICs2LDcgQEANCiAjIFBST1ZJREU6IGlwNmFkZHJjdGwNCiAjIFJFUVVJ UkU6IG1vdW50Y3JpdGxvY2FsIG5ldGlmDQogIyBCRUZPUkU6IG5ldHdvcmtf aXB2Ng0KLSMgS0VZV09SRDogbm9qYWlsDQorIyBLRVlXT1JEOiBub2phaWwg Ym9vdGVhcmx5DQogDQogLiAvZXRjL3JjLnN1YnINCiANCkluZGV4OiByYy5k L2lwNmZ3DQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hv bWUvbmN2cy9zcmMvZXRjL3JjLmQvaXA2Zncsdg0KcmV0cmlldmluZyByZXZp c2lvbiAxLjYNCmRpZmYgLXUgLXIxLjYgaXA2ZncNCi0tLSByYy5kL2lwNmZ3 CTcgT2N0IDIwMDQgMTM6NTU6MjYgLTAwMDAJMS42DQorKysgcmMuZC9pcDZm dwkxMiBKdW4gMjAwNSAxOToxMDoyMiAtMDAwMA0KQEAgLTYsNyArNiw3IEBA DQogIyBQUk9WSURFOiBpcDZmdw0KICMgUkVRVUlSRTogcm91dGluZw0KICMg QkVGT1JFOiBuZXR3b3JrX2lwdjYNCi0jIEtFWVdPUkQ6IG5vamFpbA0KKyMg S0VZV09SRDogbm9qYWlsIGJvb3RlYXJseQ0KIA0KIC4gL2V0Yy9yYy5zdWJy DQogDQpJbmRleDogcmMuZC9pcGZpbHRlcg0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQ0KUkNTIGZpbGU6IC9ob21lL25jdnMvc3JjL2V0Yy9yYy5kL2lwZmls dGVyLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4yMg0KZGlmZiAtdSAtcjEu MjIgaXBmaWx0ZXINCi0tLSByYy5kL2lwZmlsdGVyCTcgT2N0IDIwMDQgMTM6 NTU6MjYgLTAwMDAJMS4yMg0KKysrIHJjLmQvaXBmaWx0ZXIJMTIgSnVuIDIw MDUgMTk6MTA6MjIgLTAwMDANCkBAIC03LDcgKzcsNyBAQA0KICMgUFJPVklE RTogaXBmaWx0ZXINCiAjIFJFUVVJUkU6IHJvb3QgbW91bnRjcml0bG9jYWwN CiAjIEJFRk9SRTogIG5ldGlmDQotIyBLRVlXT1JEOiBub2phaWwNCisjIEtF WVdPUkQ6IG5vamFpbCBib290ZWFybHkNCiANCiAuIC9ldGMvcmMuc3Vicg0K IA0KSW5kZXg6IHJjLmQvaXBmcw0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K UkNTIGZpbGU6IC9ob21lL25jdnMvc3JjL2V0Yy9yYy5kL2lwZnMsdg0KcmV0 cmlldmluZyByZXZpc2lvbiAxLjYNCmRpZmYgLXUgLXIxLjYgaXBmcw0KLS0t IHJjLmQvaXBmcwk3IE9jdCAyMDA0IDEzOjU1OjI2IC0wMDAwCTEuNg0KKysr IHJjLmQvaXBmcwkxMiBKdW4gMjAwNSAxOToxMDoyMiAtMDAwMA0KQEAgLTcs NyArNyw3IEBADQogIyBQUk9WSURFOiBpcGZzDQogIyBSRVFVSVJFOiBpcG5h dA0KICMgQkVGT1JFOiAgbmV0aWYNCi0jIEtFWVdPUkQ6IG5vamFpbCBzaHV0 ZG93bg0KKyMgS0VZV09SRDogbm9qYWlsIHNodXRkb3duIGJvb3RlYXJseQ0K IA0KIC4gL2V0Yy9yYy5zdWJyDQogDQpJbmRleDogcmMuZC9pcGZ3DQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvbmN2cy9zcmMv ZXRjL3JjLmQvaXBmdyx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTANCmRp ZmYgLXUgLXIxLjEwIGlwZncNCi0tLSByYy5kL2lwZncJMTYgTWFyIDIwMDUg MDg6NDc6NDggLTAwMDAJMS4xMA0KKysrIHJjLmQvaXBmdwkxMiBKdW4gMjAw NSAxOToxMDoyMiAtMDAwMA0KQEAgLTYsNyArNiw3IEBADQogIyBQUk9WSURF OiBpcGZ3DQogIyBSRVFVSVJFOiBwcHAtdXNlcg0KICMgQkVGT1JFOiBORVRX T1JLSU5HDQotIyBLRVlXT1JEOiBub2phaWwNCisjIEtFWVdPUkQ6IG5vamFp bCBib290ZWFybHkNCiANCiAuIC9ldGMvcmMuc3Vicg0KIC4gL2V0Yy9uZXR3 b3JrLnN1YnINCkluZGV4OiByYy5kL2lwbmF0DQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvbmN2cy9zcmMvZXRjL3JjLmQvaXBu YXQsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjE0DQpkaWZmIC11IC1yMS4x NCBpcG5hdA0KLS0tIHJjLmQvaXBuYXQJNyBPY3QgMjAwNCAxMzo1NToyNiAt MDAwMAkxLjE0DQorKysgcmMuZC9pcG5hdAkxMiBKdW4gMjAwNSAxOToxMDoy MiAtMDAwMA0KQEAgLTcsNyArNyw3IEBADQogIyBQUk9WSURFOiBpcG5hdA0K ICMgUkVRVUlSRTogaXBmaWx0ZXINCiAjIEJFRk9SRTogIERBRU1PTiBuZXRp Zg0KLSMgS0VZV09SRDogbm9qYWlsDQorIyBLRVlXT1JEOiBub2phaWwgYm9v dGVhcmx5DQogDQogLiAvZXRjL3JjLnN1YnINCiANCkluZGV4OiByYy5kL2lz ZG5kDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUv bmN2cy9zcmMvZXRjL3JjLmQvaXNkbmQsdg0KcmV0cmlldmluZyByZXZpc2lv biAxLjIwDQpkaWZmIC11IC1yMS4yMCBpc2RuZA0KLS0tIHJjLmQvaXNkbmQJ MTYgSmFuIDIwMDUgMDM6MTI6MDMgLTAwMDAJMS4yMA0KKysrIHJjLmQvaXNk bmQJMTIgSnVuIDIwMDUgMTk6MTA6MjIgLTAwMDANCkBAIC04LDcgKzgsNyBA QA0KIA0KICMgUFJPVklERTogaXNkbmQNCiAjIFJFUVVJUkU6IG5ldGlmIG1v dW50Y3JpdGxvY2FsIGNsZWFudmFyDQotIyBLRVlXT1JEOiBub2phaWwNCisj IEtFWVdPUkQ6IG5vamFpbCBib290ZWFybHkNCiANCiAuIC9ldGMvcmMuc3Vi cg0KIA0KSW5kZXg6IHJjLmQva2xkeHJlZg0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQ0KUkNTIGZpbGU6IC9ob21lL25jdnMvc3JjL2V0Yy9yYy5kL2tsZHhy ZWYsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjQNCmRpZmYgLXUgLXIxLjQg a2xkeHJlZg0KLS0tIHJjLmQva2xkeHJlZgk3IE9jdCAyMDA0IDEzOjU1OjI2 IC0wMDAwCTEuNA0KKysrIHJjLmQva2xkeHJlZgkxMiBKdW4gMjAwNSAxOTox MDoyMiAtMDAwMA0KQEAgLTYsNyArNiw3IEBADQogIyBQUk9WSURFOiBrbGR4 cmVmDQogIyBSRVFVSVJFOiByb290IG1vdW50Y3JpdGxvY2FsDQogIyBCRUZP UkU6ICBuZXRpZg0KLSMgS0VZV09SRDogbm9qYWlsDQorIyBLRVlXT1JEOiBu b2phaWwgYm9vdGVhcmx5DQogDQogLiAvZXRjL3JjLnN1YnINCiANCkluZGV4 OiByYy5kL2xvY2FscGtnDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1Mg ZmlsZTogL2hvbWUvbmN2cy9zcmMvZXRjL3JjLmQvbG9jYWxwa2csdg0KcmV0 cmlldmluZyByZXZpc2lvbiAxLjUNCmRpZmYgLXUgLXIxLjUgbG9jYWxwa2cN Ci0tLSByYy5kL2xvY2FscGtnCTcgT2N0IDIwMDQgMTM6NTU6MjYgLTAwMDAJ MS41DQorKysgcmMuZC9sb2NhbHBrZwkxMiBKdW4gMjAwNSAxOToxMDoyMiAt MDAwMA0KQEAgLTE0LDYgKzE0LDkgQEANCiBzdGFydF9jbWQ9InBrZ19zdGFy dCINCiBzdG9wX2NtZD0icGtnX3N0b3AiDQogDQorcmNvcmRlcl9vcHRzPSIi DQorWyBgL3NiaW4vc3lzY3RsIC1uIHNlY3VyaXR5LmphaWwuamFpbGVkYCAt ZXEgMSBdICYmIHJjb3JkZXJfb3B0cz0iLXMgbm9qYWlsIg0KKw0KIHBrZ19z dGFydCgpDQogew0KIAkjIEZvciBlYWNoIGRpciBpbiAkbG9jYWxfc3RhcnR1 cCwgc2VhcmNoIGZvciBpbml0IHNjcmlwdHMgbWF0Y2hpbmcgKi5zaA0KQEAg LTI0LDE5ICsyNywxNCBAQA0KIAkqKQ0KIAkJZWNobyAtbiAnTG9jYWwgcGFj a2FnZSBpbml0aWFsaXphdGlvbjonDQogCQlzbGlzdD0iIg0KLQkJaWYgWyAt eiAiJHtzY3JpcHRfbmFtZV9zZXB9IiBdOyB0aGVuDQotCQkJc2NyaXB0X25h bWVfc2VwPSIgIg0KLQkJZmkNCisJCXpsaXN0PSIiDQogCQlmb3IgZGlyIGlu ICR7bG9jYWxfc3RhcnR1cH07IGRvDQogCQkJaWYgWyAtZCAiJHtkaXJ9IiBd OyB0aGVuDQotCQkJCWZvciBzY3JpcHQgaW4gJHtkaXJ9Lyouc2g7IGRvDQot CQkJCQlzbGlzdD0iJHtzbGlzdH0ke3NjcmlwdF9uYW1lX3NlcH0ke3Njcmlw dH0iDQotCQkJCWRvbmUNCisJCQkJc2xpc3Q9IiR7c2xpc3R9ICR7ZGlyfS9b XjAtOV0qLnNoIg0KKwkJCQl6bGlzdD0iJHt6bGlzdH0gJHtkaXJ9L1swLTld Ki5zaCINCiAJCQlmaQ0KIAkJZG9uZQ0KLQkJc2NyaXB0X3NhdmVfc2VwPSIk SUZTIg0KLQkJSUZTPSIke3NjcmlwdF9uYW1lX3NlcH0iDQotCQlmb3Igc2Ny aXB0IGluICR7c2xpc3R9OyBkbw0KKwkJZm9yIHNjcmlwdCBpbiAke3psaXN0 fSBgcmNvcmRlciAtcyBub3N0YXJ0ICR7cmNvcmRlcl9vcHRzfSAke3NsaXN0 fSAyPi9kZXYvbnVsbGA7IGRvDQogCQkJaWYgWyAteCAiJHtzY3JpcHR9IiBd OyB0aGVuDQogCQkJCShzZXQgLVQNCiAJCQkJdHJhcCAnZXhpdCAxJyAyDQpA QCAtNDUsNyArNDMsNiBAQA0KIAkJCQllY2hvIC1uICIgKHNraXBwaW5nICR7 c2NyaXB0IyMqL30sIG5vdCBleGVjdXRhYmxlKSINCiAJCQlmaQ0KIAkJZG9u ZQ0KLQkJSUZTPSIke3NjcmlwdF9zYXZlX3NlcH0iDQogCQllY2hvICcuJw0K IAkJOzsNCiAJZXNhYw0KQEAgLTYxLDI2ICs1OCwyMCBAQA0KIAkJOzsNCiAJ KikNCiAJCXNsaXN0PSIiDQotCQlpZiBbIC16ICIke3NjcmlwdF9uYW1lX3Nl cH0iIF07IHRoZW4NCi0JCQlzY3JpcHRfbmFtZV9zZXA9IiAiDQotCQlmaQ0K KwkJemxpc3Q9IiINCiAJCWZvciBkaXIgaW4gJHtsb2NhbF9zdGFydHVwfTsg ZG8NCiAJCQlpZiBbIC1kICIke2Rpcn0iIF07IHRoZW4NCi0JCQkJZm9yIHNj cmlwdCBpbiAke2Rpcn0vKi5zaDsgZG8NCi0JCQkJCXNsaXN0PSIke3NsaXN0 fSR7c2NyaXB0X25hbWVfc2VwfSR7c2NyaXB0fSINCi0JCQkJZG9uZQ0KKwkJ CQlzbGlzdD0iJHtzbGlzdH0gJHtkaXJ9L1teMC05XSouc2giDQorCQkJCXps aXN0PSIke3psaXN0fSAke2Rpcn0vWzAtOV0qLnNoIg0KIAkJCWZpDQogCQlk b25lDQotCQlzY3JpcHRfc2F2ZV9zZXA9IiRJRlMiDQotCQlJRlM9IiR7c2Ny aXB0X25hbWVfc2VwfSINCi0JCWZvciBzY3JpcHQgaW4gYHJldmVyc2VfbGlz dCAke3NsaXN0fWA7IGRvDQorCQlmb3Igc2NyaXB0IGluIGByZXZlcnNlX2xp c3QgJHt6bGlzdH0gXGByY29yZGVyIC1rIHNodXRkb3duICR7cmNvcmRlcl9v cHRzfSAke3NsaXN0fSAyPi9kZXYvbnVsbFxgYDsgZG8NCiAJCQlpZiBbIC14 ICIke3NjcmlwdH0iIF07IHRoZW4NCiAJCQkJKHNldCAtVA0KIAkJCQl0cmFw ICdleGl0IDEnIDINCiAJCQkJJHtzY3JpcHR9IHN0b3ApDQogCQkJZmkNCiAJ CWRvbmUNCi0JCUlGUz0iJHtzY3JpcHRfc2F2ZV9zZXB9Ig0KIAkJZWNobyAn LicNCiAJCTs7DQogCWVzYWMNCkluZGV4OiByYy5kL21vdW50Y3JpdGxvY2Fs DQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvbmN2 cy9zcmMvZXRjL3JjLmQvbW91bnRjcml0bG9jYWwsdg0KcmV0cmlldmluZyBy ZXZpc2lvbiAxLjEyDQpkaWZmIC11IC1yMS4xMiBtb3VudGNyaXRsb2NhbA0K LS0tIHJjLmQvbW91bnRjcml0bG9jYWwJNyBPY3QgMjAwNCAxMzo1NToyNiAt MDAwMAkxLjEyDQorKysgcmMuZC9tb3VudGNyaXRsb2NhbAkxMiBKdW4gMjAw NSAxOToxMDoyMiAtMDAwMA0KQEAgLTYsNyArNiw3IEBADQogDQogIyBQUk9W SURFOiBtb3VudGNyaXRsb2NhbA0KICMgUkVRVUlSRTogcm9vdA0KLSMgS0VZ V09SRDogbm9qYWlsDQorIyBLRVlXT1JEOiBub2phaWwgYm9vdGVhcmx5DQog DQogLiAvZXRjL3JjLnN1YnINCiANCkluZGV4OiByYy5kL21vdW50Y3JpdHJl bW90ZQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9ob21l L25jdnMvc3JjL2V0Yy9yYy5kL21vdW50Y3JpdHJlbW90ZSx2DQpyZXRyaWV2 aW5nIHJldmlzaW9uIDEuMTENCmRpZmYgLXUgLXIxLjExIG1vdW50Y3JpdHJl bW90ZQ0KLS0tIHJjLmQvbW91bnRjcml0cmVtb3RlCTE2IEphbiAyMDA1IDAz OjEyOjAzIC0wMDAwCTEuMTENCisrKyByYy5kL21vdW50Y3JpdHJlbW90ZQkx MiBKdW4gMjAwNSAxOToxMDoyMiAtMDAwMA0KQEAgLTYsNyArNiw3IEBADQog DQogIyBQUk9WSURFOiBtb3VudGNyaXRyZW1vdGUNCiAjIFJFUVVJUkU6IE5F VFdPUktJTkcgcm9vdCBtb3VudGNyaXRsb2NhbCBjbGVhbnZhcg0KLSMgS0VZ V09SRDogbm9qYWlsDQorIyBLRVlXT1JEOiBub2phaWwgYm9vdGVhcmx5DQog DQogLiAvZXRjL3JjLnN1YnINCiANCkluZGV4OiByYy5kL21yb3V0ZTZkDQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvbmN2cy9z cmMvZXRjL3JjLmQvbXJvdXRlNmQsdg0KcmV0cmlldmluZyByZXZpc2lvbiAx LjQNCmRpZmYgLXUgLXIxLjQgbXJvdXRlNmQNCi0tLSByYy5kL21yb3V0ZTZk CTcgT2N0IDIwMDQgMTM6NTU6MjYgLTAwMDAJMS40DQorKysgcmMuZC9tcm91 dGU2ZAkxMiBKdW4gMjAwNSAxOToxMDoyMiAtMDAwMA0KQEAgLTUsNyArNSw3 IEBADQogDQogIyBQUk9WSURFOiBtcm91dGU2ZA0KICMgUkVRVUlSRTogbmV0 d29ya19pcHY2DQotIyBLRVlXT1JEOiBub2phaWwNCisjIEtFWVdPUkQ6IG5v amFpbCBib290ZWFybHkNCiANCiAuIC9ldGMvcmMuc3Vicg0KIA0KSW5kZXg6 IHJjLmQvbXJvdXRlZA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZp bGU6IC9ob21lL25jdnMvc3JjL2V0Yy9yYy5kL21yb3V0ZWQsdg0KcmV0cmll dmluZyByZXZpc2lvbiAxLjkNCmRpZmYgLXUgLXIxLjkgbXJvdXRlZA0KLS0t IHJjLmQvbXJvdXRlZAkxNiBKYW4gMjAwNSAwMzoxMjowMyAtMDAwMAkxLjkN CisrKyByYy5kL21yb3V0ZWQJMTIgSnVuIDIwMDUgMTk6MTA6MjIgLTAwMDAN CkBAIC02LDcgKzYsNyBAQA0KIA0KICMgUFJPVklERTogbXJvdXRlZA0KICMg UkVRVUlSRTogbmV0aWYgcm91dGluZyBjbGVhbnZhcg0KLSMgS0VZV09SRDog bm9qYWlsDQorIyBLRVlXT1JEOiBub2phaWwgYm9vdGVhcmx5DQogDQogLiAv ZXRjL3JjLnN1YnINCiANCkluZGV4OiByYy5kL25ldGlmDQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvbmN2cy9zcmMvZXRjL3Jj LmQvbmV0aWYsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjEzDQpkaWZmIC11 IC1yMS4xMyBuZXRpZg0KLS0tIHJjLmQvbmV0aWYJNyBKdW4gMjAwNSAwNDo0 OToxMiAtMDAwMAkxLjEzDQorKysgcmMuZC9uZXRpZgkxMiBKdW4gMjAwNSAx OToxMDoyMiAtMDAwMA0KQEAgLTI3LDcgKzI3LDcgQEANCiANCiAjIFBST1ZJ REU6IG5ldGlmDQogIyBSRVFVSVJFOiBhdG0xIGlwZmlsdGVyIG1vdW50Y3Jp dGxvY2FsIHBjY2FyZCBzZXJpYWwgc3BwcCBzeXNjdGwNCi0jIEtFWVdPUkQ6 IG5vamFpbA0KKyMgS0VZV09SRDogbm9qYWlsIGJvb3RlYXJseQ0KIA0KIC4g L2V0Yy9yYy5zdWJyDQogLiAvZXRjL25ldHdvcmsuc3Vicg0KSW5kZXg6IHJj LmQvbmV0d29ya19pcHY2DQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1Mg ZmlsZTogL2hvbWUvbmN2cy9zcmMvZXRjL3JjLmQvbmV0d29ya19pcHY2LHYN CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zNw0KZGlmZiAtdSAtcjEuMzcgbmV0 d29ya19pcHY2DQotLS0gcmMuZC9uZXR3b3JrX2lwdjYJNyBPY3QgMjAwNCAx Mzo1NToyNiAtMDAwMAkxLjM3DQorKysgcmMuZC9uZXR3b3JrX2lwdjYJMTIg SnVuIDIwMDUgMTk6MTA6MjIgLTAwMDANCkBAIC0zMCw3ICszMCw3IEBADQog DQogIyBQUk9WSURFOiBuZXR3b3JrX2lwdjYNCiAjIFJFUVVJUkU6IHJvdXRp bmcNCi0jIEtFWVdPUkQ6IG5vamFpbA0KKyMgS0VZV09SRDogbm9qYWlsIGJv b3RlYXJseQ0KIA0KIC4gL2V0Yy9yYy5zdWJyDQogLiAvZXRjL25ldHdvcmsu c3Vicg0KSW5kZXg6IHJjLmQvbnNzd2l0Y2gNCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0NClJDUyBmaWxlOiAvaG9tZS9uY3ZzL3NyYy9ldGMvcmMuZC9uc3N3 aXRjaCx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNQ0KZGlmZiAtdSAtcjEu NSBuc3N3aXRjaA0KLS0tIHJjLmQvbnNzd2l0Y2gJNyBPY3QgMjAwNCAxMzo1 NToyNiAtMDAwMAkxLjUNCisrKyByYy5kL25zc3dpdGNoCTEyIEp1biAyMDA1 IDE5OjEwOjIyIC0wMDAwDQpAQCAtMjksNiArMjksNyBAQA0KICMgUFJPVklE RTogbnNzd2l0Y2gNCiAjIFJFUVVJUkU6IHJvb3QNCiAjIEJFRk9SRTogIE5F VFdPUksNCisjIEtFWVdPUkQ6IGJvb3RlYXJseQ0KIA0KIC4gL2V0Yy9yYy5z dWJyDQogDQpJbmRleDogcmMuZC9wY2NhcmQNCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0NClJDUyBmaWxlOiAvaG9tZS9uY3ZzL3NyYy9ldGMvcmMuZC9wY2Nh cmQsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjMwDQpkaWZmIC11IC1yMS4z MCBwY2NhcmQNCi0tLSByYy5kL3BjY2FyZAk3IE9jdCAyMDA0IDEzOjU1OjI2 IC0wMDAwCTEuMzANCisrKyByYy5kL3BjY2FyZAkxMiBKdW4gMjAwNSAxOTox MDoyMiAtMDAwMA0KQEAgLTI5LDcgKzI5LDcgQEANCiANCiAjIFBST1ZJREU6 IHBjY2FyZA0KICMgUkVRVUlSRTogbW91bnRjcml0bG9jYWwNCi0jIEtFWVdP UkQ6IG5vamFpbA0KKyMgS0VZV09SRDogbm9qYWlsIGJvb3RlYXJseQ0KIA0K IC4gL2V0Yy9yYy5zdWJyDQogDQpJbmRleDogcmMuZC9wcHAtdXNlcg0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9ob21lL25jdnMvc3Jj L2V0Yy9yYy5kL3BwcC11c2VyLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS43 DQpkaWZmIC11IC1yMS43IHBwcC11c2VyDQotLS0gcmMuZC9wcHAtdXNlcgkx NSBEZWMgMjAwNCAxMjozOToyOCAtMDAwMAkxLjcNCisrKyByYy5kL3BwcC11 c2VyCTEyIEp1biAyMDA1IDE5OjEwOjIyIC0wMDAwDQpAQCAtNSw3ICs1LDcg QEANCiANCiAjIFBST1ZJREU6IHBwcC11c2VyDQogIyBSRVFVSVJFOiBuZXRp ZiBpc2RuZA0KLSMgS0VZV09SRDogbm9qYWlsDQorIyBLRVlXT1JEOiBub2ph aWwgYm9vdGVhcmx5DQogDQogLiAvZXRjL3JjLnN1YnINCiANCkluZGV4OiBy Yy5kL3JhbWRpc2sNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxl OiAvaG9tZS9uY3ZzL3NyYy9ldGMvcmMuZC9yYW1kaXNrLHYNCnJldHJpZXZp bmcgcmV2aXNpb24gMS40DQpkaWZmIC11IC1yMS40IHJhbWRpc2sNCi0tLSBy Yy5kL3JhbWRpc2sJNyBPY3QgMjAwNCAxMzo1NToyNiAtMDAwMAkxLjQNCisr KyByYy5kL3JhbWRpc2sJMTIgSnVuIDIwMDUgMTk6MTA6MjIgLTAwMDANCkBA IC0zMCw2ICszMCw3IEBADQogIyBQUk9WSURFOiByYW1kaXNrDQogIyBSRVFV SVJFOiBsb2NhbHN3YXANCiAjIEJFRk9SRTogbW91bnRjcml0bG9jYWwNCisj IEtFWVdPUkQ6IGJvb3RlYXJseQ0KIA0KIC4gL2V0Yy9yYy5zdWJyDQogDQpJ bmRleDogcmMuZC9yYW5kb20NCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJD UyBmaWxlOiAvaG9tZS9uY3ZzL3NyYy9ldGMvcmMuZC9yYW5kb20sdg0KcmV0 cmlldmluZyByZXZpc2lvbiAxLjgNCmRpZmYgLXUgLXIxLjggcmFuZG9tDQot LS0gcmMuZC9yYW5kb20JMTEgQXByIDIwMDUgMDI6NDU6MDUgLTAwMDAJMS44 DQorKysgcmMuZC9yYW5kb20JMTIgSnVuIDIwMDUgMTk6MTA6MjIgLTAwMDAN CkBAIC02LDcgKzYsNyBAQA0KICMgUFJPVklERTogcmFuZG9tDQogIyBSRVFV SVJFOiB2YXIgaW5pdHJhbmRvbQ0KICMgQkVGT1JFOiBuZXRpZg0KLSMgS0VZ V09SRDogbm9qYWlsIHNodXRkb3duDQorIyBLRVlXT1JEOiBub2phaWwgc2h1 dGRvd24gYm9vdGVhcmx5DQogDQogLiAvZXRjL3JjLnN1YnINCiANCkluZGV4 OiByYy5kL3JjY29uZi5zaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNT IGZpbGU6IC9ob21lL25jdnMvc3JjL2V0Yy9yYy5kL3JjY29uZi5zaCx2DQpy ZXRyaWV2aW5nIHJldmlzaW9uIDEuNA0KZGlmZiAtdSAtcjEuNCByY2NvbmYu c2gNCi0tLSByYy5kL3JjY29uZi5zaAkyOSBBcHIgMjAwNSAyMzowMjo1NiAt MDAwMAkxLjQNCisrKyByYy5kL3JjY29uZi5zaAkxMiBKdW4gMjAwNSAxOTox MDoyMiAtMDAwMA0KQEAgLTUsNiArNSw3IEBADQogDQogIyBQUk9WSURFOiBy Y2NvbmYNCiAjIEJFRk9SRTogIGRpc2tzIGluaXRyYW5kb20NCisjIEtFWVdP UkQ6IGJvb3RlYXJseQ0KIA0KIC4gL2V0Yy9yYy5zdWJyDQogDQpJbmRleDog cmMuZC9yb290DQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTog L2hvbWUvbmN2cy9zcmMvZXRjL3JjLmQvcm9vdCx2DQpyZXRyaWV2aW5nIHJl dmlzaW9uIDEuMTANCmRpZmYgLXUgLXIxLjEwIHJvb3QNCi0tLSByYy5kL3Jv b3QJNyBPY3QgMjAwNCAxMzo1NToyNiAtMDAwMAkxLjEwDQorKysgcmMuZC9y b290CTEyIEp1biAyMDA1IDE5OjEwOjIyIC0wMDAwDQpAQCAtNiw3ICs2LDcg QEANCiANCiAjIFBST1ZJREU6IHJvb3QNCiAjIFJFUVVJUkU6IGZzY2sNCi0j IEtFWVdPUkQ6IG5vamFpbA0KKyMgS0VZV09SRDogbm9qYWlsIGJvb3RlYXJs eQ0KIA0KIC4gL2V0Yy9yYy5zdWJyDQogDQpJbmRleDogcmMuZC9yb3V0ZTZk DQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUvbmN2 cy9zcmMvZXRjL3JjLmQvcm91dGU2ZCx2DQpyZXRyaWV2aW5nIHJldmlzaW9u IDEuOQ0KZGlmZiAtdSAtcjEuOSByb3V0ZTZkDQotLS0gcmMuZC9yb3V0ZTZk CTcgT2N0IDIwMDQgMTM6NTU6MjYgLTAwMDAJMS45DQorKysgcmMuZC9yb3V0 ZTZkCTEyIEp1biAyMDA1IDE5OjEwOjIyIC0wMDAwDQpAQCAtNiw3ICs2LDcg QEANCiANCiAjIFBST1ZJREU6IHJvdXRlNmQNCiAjIFJFUVVJUkU6IG5ldHdv cmtfaXB2Ng0KLSMgS0VZV09SRDogbm9qYWlsDQorIyBLRVlXT1JEOiBub2ph aWwgYm9vdGVhcmx5DQogDQogLiAvZXRjL3JjLnN1YnINCiANCkluZGV4OiBy Yy5kL3JvdXRlZA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6 IC9ob21lL25jdnMvc3JjL2V0Yy9yYy5kL3JvdXRlZCx2DQpyZXRyaWV2aW5n IHJldmlzaW9uIDEuMTINCmRpZmYgLXUgLXIxLjEyIHJvdXRlZA0KLS0tIHJj LmQvcm91dGVkCTcgT2N0IDIwMDQgMTM6NTU6MjYgLTAwMDAJMS4xMg0KKysr IHJjLmQvcm91dGVkCTEyIEp1biAyMDA1IDE5OjEwOjIyIC0wMDAwDQpAQCAt Niw3ICs2LDcgQEANCiANCiAjIFBST1ZJREU6IHJvdXRlZA0KICMgUkVRVUlS RTogbmV0aWYgcm91dGluZw0KLSMgS0VZV09SRDogbm9qYWlsDQorIyBLRVlX T1JEOiBub2phaWwgYm9vdGVhcmx5DQogDQogLiAvZXRjL3JjLnN1YnINCiAN CkluZGV4OiByYy5kL3JvdXRpbmcNCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N ClJDUyBmaWxlOiAvaG9tZS9uY3ZzL3NyYy9ldGMvcmMuZC9yb3V0aW5nLHYN CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xNDENCmRpZmYgLXUgLXIxLjE0MSBy b3V0aW5nDQotLS0gcmMuZC9yb3V0aW5nCTcgT2N0IDIwMDQgMTM6NTU6MjYg LTAwMDAJMS4xNDENCisrKyByYy5kL3JvdXRpbmcJMTIgSnVuIDIwMDUgMTk6 MTA6MjIgLTAwMDANCkBAIC03LDcgKzcsNyBAQA0KIA0KICMgUFJPVklERTog cm91dGluZw0KICMgUkVRVUlSRTogbmV0aWYgcHBwLXVzZXINCi0jIEtFWVdP UkQ6IG5vamFpbA0KKyMgS0VZV09SRDogbm9qYWlsIGJvb3RlYXJseQ0KIA0K IC4gL2V0Yy9yYy5zdWJyDQogDQpJbmRleDogcmMuZC9zZXJpYWwNCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvaG9tZS9uY3ZzL3NyYy9l dGMvcmMuZC9zZXJpYWwsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjI0DQpk aWZmIC11IC1yMS4yNCBzZXJpYWwNCi0tLSByYy5kL3NlcmlhbAkxNCBOb3Yg MjAwNCAxOTo1MTozNCAtMDAwMAkxLjI0DQorKysgcmMuZC9zZXJpYWwJMTIg SnVuIDIwMDUgMTk6MTA6MjIgLTAwMDANCkBAIC0yOSw3ICsyOSw3IEBADQog DQogIyBQUk9WSURFOiBzZXJpYWwNCiAjIFJFUVVJUkU6IHJvb3QNCi0jIEtF WVdPUkQ6IG5vamFpbA0KKyMgS0VZV09SRDogbm9qYWlsIGJvb3RlYXJseQ0K IA0KICMgQ2hhbmdlIHNvbWUgZGVmYXVsdHMgZm9yIHNlcmlhbCBkZXZpY2Vz Lg0KICMgU3RhbmRhcmQgZGVmYXVsdHMgYXJlOg0KSW5kZXg6IHJjLmQvc3Bw cA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9ob21lL25j dnMvc3JjL2V0Yy9yYy5kL3NwcHAsdg0KcmV0cmlldmluZyByZXZpc2lvbiAx LjQNCmRpZmYgLXUgLXIxLjQgc3BwcA0KLS0tIHJjLmQvc3BwcAk3IE9jdCAy MDA0IDEzOjU1OjI2IC0wMDAwCTEuNA0KKysrIHJjLmQvc3BwcAkxMiBKdW4g MjAwNSAxOToxMDoyMiAtMDAwMA0KQEAgLTYsNyArNiw3IEBADQogIyBQUk9W SURFOiBzcHBwDQogIyBSRVFVSVJFOiByb290DQogIyBCRUZPUkU6IG5ldGlm DQotIyBLRVlXT1JEOiBub2phaWwNCisjIEtFWVdPUkQ6IG5vamFpbCBib290 ZWFybHkNCiANCiAuIC9ldGMvcmMuc3Vicg0KIA0KSW5kZXg6IHJjLmQvc3dh cDENCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvaG9tZS9u Y3ZzL3NyYy9ldGMvcmMuZC9zd2FwMSx2DQpyZXRyaWV2aW5nIHJldmlzaW9u IDEuOQ0KZGlmZiAtdSAtcjEuOSBzd2FwMQ0KLS0tIHJjLmQvc3dhcDEJNSBO b3YgMjAwNCAxMjozODoyNyAtMDAwMAkxLjkNCisrKyByYy5kL3N3YXAxCTEy IEp1biAyMDA1IDE5OjEwOjIyIC0wMDAwDQpAQCAtNiw3ICs2LDcgQEANCiAN CiAjIFBST1ZJREU6IGxvY2Fsc3dhcA0KICMgUkVRVUlSRTogZGlza3MNCi0j IEtFWVdPUkQ6IG5vamFpbCBzaHV0ZG93bg0KKyMgS0VZV09SRDogbm9qYWls IHNodXRkb3duIGJvb3RlYXJseQ0KIA0KIC4gL2V0Yy9yYy5zdWJyDQogDQpJ bmRleDogcmMuZC9zeXNjdGwNCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJD UyBmaWxlOiAvaG9tZS9uY3ZzL3NyYy9ldGMvcmMuZC9zeXNjdGwsdg0KcmV0 cmlldmluZyByZXZpc2lvbiAxLjE2DQpkaWZmIC11IC1yMS4xNiBzeXNjdGwN Ci0tLSByYy5kL3N5c2N0bAk3IE9jdCAyMDA0IDEzOjU1OjI2IC0wMDAwCTEu MTYNCisrKyByYy5kL3N5c2N0bAkxMiBKdW4gMjAwNSAxOToxMDoyMiAtMDAw MA0KQEAgLTcsNiArNyw3IEBADQogIyBQUk9WSURFOiBzeXNjdGwNCiAjIFJF UVVJUkU6IHJvb3QNCiAjIEJFRk9SRTogIERBRU1PTg0KKyMgS0VZV09SRDog Ym9vdGVhcmx5DQogDQogLiAvZXRjL3JjLnN1YnINCiANCkluZGV4OiByYy5k L3Zhcg0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9ob21l L25jdnMvc3JjL2V0Yy9yYy5kL3Zhcix2DQpyZXRyaWV2aW5nIHJldmlzaW9u IDEuNDANCmRpZmYgLXUgLXIxLjQwIHZhcg0KLS0tIHJjLmQvdmFyCTIgTWFy IDIwMDUgMTY6NDE6MzUgLTAwMDAJMS40MA0KKysrIHJjLmQvdmFyCTEyIEp1 biAyMDA1IDE5OjEwOjIyIC0wMDAwDQpAQCAtMjksNiArMjksNyBAQA0KIA0K ICMgUFJPVklERTogdmFyDQogIyBSRVFVSVJFOiBtb3VudGNyaXRsb2NhbA0K KyMgS0VZV09SRDogYm9vdGVhcmx5DQogDQogLiAvZXRjL3JjLnN1YnINCiAN Cg== --0-68652384-1118604002=:844-- From owner-freebsd-rc@FreeBSD.ORG Sun Jun 12 19:27:36 2005 Return-Path: X-Original-To: freebsd-rc@FreeBSD.org Delivered-To: freebsd-rc@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D18B516A41C for ; Sun, 12 Jun 2005 19:27:36 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: from mail1.fluidhosting.com (mail1.fluidhosting.com [66.150.201.101]) by mx1.FreeBSD.org (Postfix) with SMTP id 6444743D1D for ; Sun, 12 Jun 2005 19:27:36 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: (qmail 14785 invoked by uid 399); 12 Jun 2005 19:27:35 -0000 Received: from unknown (HELO ?192.168.15.101?) (dougb@dougbarton.net@67.20.70.103) by mail1.fluidhosting.com with SMTP; 12 Jun 2005 19:27:35 -0000 Message-ID: <42AC8CA6.6060406@FreeBSD.org> Date: Sun, 12 Jun 2005 12:27:34 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Mozilla Thunderbird 1.0.2 (X11/20050326) X-Accept-Language: en-us, en MIME-Version: 1.0 To: freebsd-rc@FreeBSD.org References: <20050607033536.GH37208@linwhf.opal.com> <20050607160855.GO37208@linwhf.opal.com> <20050607173741.GI11758@odin.ac.hmc.edu> <20050607191109.GU37208@linwhf.opal.com> <20050608233802.GA29707@odin.ac.hmc.edu> <20050609003459.GK37208@linwhf.opal.com> <20050609050517.GA28710@odin.ac.hmc.edu> <42A89CD7.1080404@FreeBSD.org> <20050609201017.GA10248@odin.ac.hmc.edu> <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg> In-Reply-To: <20050612121504.K844@ync.qbhto.arg> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: "J.R. Oldroyd" Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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, 12 Jun 2005 19:27:36 -0000 Doug Barton wrote: > Ok, here is a patch. Sorry it took so long to get to this, but real life > interfered. > > I used JR's latest localpkg patch intact, and modified part of his rc > patch to get that working. I'm not tied to either of the keywords I > chose, bootearly and PORTS_RCORDER, so if someone has a better idea > don't hesitate. > > To determine what to include in bootearly I used the extremely > unscientific method of running rcorder the way it was pre-patch, and > adding the keyword to all the scripts up to and including > mountcritremote. This works in the sense that it boots my system exactly > the way that it did before, but some more careful thought could probably > be applied here by someone who knows the ins and outs of diskless > booting (Brooks?). > > I'll let this sit till Monday, since re@ has indicated that they are > flexible on some of these things, and I'd rather give you guys some time > to review it. I should have added of course that I also tested the new functionality on scripts that I put in /usr/local/etc/rc.d. Sorry about that, still a little sleep deprived. :) Doug -- This .signature sanitized for your protection From owner-freebsd-rc@FreeBSD.ORG Sun Jun 12 23:10:14 2005 Return-Path: X-Original-To: freebsd-rc@hub.freebsd.org Delivered-To: freebsd-rc@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3334416A41C for ; Sun, 12 Jun 2005 23:10:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E41A43D1F for ; Sun, 12 Jun 2005 23:10:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j5CNAD65022817 for ; Sun, 12 Jun 2005 23:10:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5CNADw0022816; Sun, 12 Jun 2005 23:10:13 GMT (envelope-from gnats) Date: Sun, 12 Jun 2005 23:10:13 GMT Message-Id: <200506122310.j5CNADw0022816@freefall.freebsd.org> To: freebsd-rc@FreeBSD.org From: Billy Newsom Cc: Subject: Re: kern/81006: ipnat not working with tunnel interfaces on startup X-BeenThere: freebsd-rc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Billy Newsom 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, 12 Jun 2005 23:10:14 -0000 The following reply was made to PR kern/81006; it has been noted by GNATS. From: Billy Newsom To: bug-followup@FreeBSD.org, nefer@gfns.net Cc: Subject: Re: kern/81006: ipnat not working with tunnel interfaces on startup Date: Sun, 12 Jun 2005 18:05:53 -0500 See also PR 81606 - Possible similarities: 1. In PR 81606, ipnat also fails to load after a reboot. 2. ipnat works fine after manually running ipnat from the shell. Differences: 2. In PR 81606, the problem occurs on a regular (but renamed) interface. "ed0" was renamed "oo0" for example. 2. In PR 81606, the issue only happened when the kernel was updated from 5.3 to 5.4. FreeBSD 5.3 worked correctly. RELENG_5 worked fine up until ~February 2005, and it broke sometime between February 2005 and May 18, 2005. From owner-freebsd-rc@FreeBSD.ORG Mon Jun 13 00:55:35 2005 Return-Path: X-Original-To: freebsd-rc@freebsd.org Delivered-To: freebsd-rc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 15C0B16A41C; Mon, 13 Jun 2005 00:55:35 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B8C843D49; Mon, 13 Jun 2005 00:55:34 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id j5D0tXIv030007; Sun, 12 Jun 2005 17:55:33 -0700 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id j5D0tXGA030006; Sun, 12 Jun 2005 17:55:33 -0700 Date: Sun, 12 Jun 2005 17:55:33 -0700 From: Brooks Davis To: Doug Barton Message-ID: <20050613005533.GA28966@odin.ac.hmc.edu> References: <20050607173741.GI11758@odin.ac.hmc.edu> <20050607191109.GU37208@linwhf.opal.com> <20050608233802.GA29707@odin.ac.hmc.edu> <20050609003459.GK37208@linwhf.opal.com> <20050609050517.GA28710@odin.ac.hmc.edu> <42A89CD7.1080404@FreeBSD.org> <20050609201017.GA10248@odin.ac.hmc.edu> <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ZGiS0Q5IWpPtfppv" Content-Disposition: inline In-Reply-To: <20050612121504.K844@ync.qbhto.arg> User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu Cc: freebsd-rc@freebsd.org, "J.R. Oldroyd" Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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: Mon, 13 Jun 2005 00:55:35 -0000 --ZGiS0Q5IWpPtfppv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 12, 2005 at 12:20:02PM -0700, Doug Barton wrote: > Ok, here is a patch. Sorry it took so long to get to this, but real life= =20 > interfered. >=20 > I used JR's latest localpkg patch intact, and modified part of his rc pat= ch=20 > to get that working. I'm not tied to either of the keywords I chose,=20 > bootearly and PORTS_RCORDER, so if someone has a better idea don't hesita= te. >=20 > To determine what to include in bootearly I used the extremely unscientif= ic=20 > method of running rcorder the way it was pre-patch, and adding the keywor= d=20 > to all the scripts up to and including mountcritremote. This works in th= e=20 > sense that it boots my system exactly the way that it did before, but som= e=20 > more careful thought could probably be applied here by someone who knows= =20 > the ins and outs of diskless booting (Brooks?). >=20 > I'll let this sit till Monday, since re@ has indicated that they are=20 > flexible on some of these things, and I'd rather give you guys some time = to=20 > review it. I don't like the idea of tagging all the scripts. First, it makes the update suck. We've done this sort of thing before with the FreeBSD tag and it was really annoying given the number of machines I ended up having to update (and users will definitly be doing the 5->6 upgrade this time since it's quite easy unlike 4->5). Second, that's a lot places to keep state up to date. JR's proposal of using a marker script had the downside of adding slightly more code to /etc/rc, but the advantage of not having to keep all the files in the right place. The local_startup collector looks pretty good. I'm not 100% how I feel about the *.sample exception. On one hand it seems like the safest thing to do, on the other hand, it's the sort of feature that tends to hang on forever. I'd be slightly inclined to complain about .sample scripts that are executable to try and get people to stop installing them. We should almost certainly complain about script that aren't *.sh that are not executable. Effectivly those will all be all port bugs. -- Brooks > +*) local_rc=3D"" > + for dir in ${local_startup}; do > + if [ -d "${dir}" ]; then > + for file in `grep -l PORTS_RCORDER ${dir}/*`; do > + case "$file" in > + *.sh|*.sample) ;; > + *) if [ -x "$file" ]; then > + local_rc=3D"${local_rc} ${file}" > + fi > + ;; > + esac > + done > + fi > + done > + ;; > +esac > + > +files=3D`rcorder ${skip} -s bootearly /etc/rc.d/* ${local_rc} 2>/dev/nul= l` > =20 > for _rc_elem in ${files}; do > run_rc_script ${_rc_elem} ${_boot} > Index: rc.d/NETWORKING > =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/NETWORKING,v > retrieving revision 1.9 > diff -u -r1.9 NETWORKING > --- rc.d/NETWORKING 7 Oct 2004 13:55:25 -0000 1.9 > +++ rc.d/NETWORKING 12 Jun 2005 19:10:22 -0000 > @@ -7,6 +7,7 @@ > # PROVIDE: NETWORKING NETWORK > # REQUIRE: dhclient netif routing network_ipv6 isdnd ppp-user > # REQUIRE: routed mrouted route6d mroute6d > +# KEYWORD: bootearly > =20 > # This is a dummy dependency, for services which require networking > # to be operational before starting. > Index: rc.d/addswap > =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/addswap,v > retrieving revision 1.4 > diff -u -r1.4 addswap > --- rc.d/addswap 7 Oct 2004 13:55:25 -0000 1.4 > +++ rc.d/addswap 12 Jun 2005 19:10:22 -0000 > @@ -8,7 +8,7 @@ > # PROVIDE: addswap > # REQUIRE: mountcritlocal > # BEFORE: sysctl > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/adjkerntz > =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/adjkerntz,v > retrieving revision 1.5 > diff -u -r1.5 adjkerntz > --- rc.d/adjkerntz 7 Oct 2004 13:55:25 -0000 1.5 > +++ rc.d/adjkerntz 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > # PROVIDE: adjkerntz > # REQUIRE: mountcritlocal random > # BEFORE: netif > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/atm1 > =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/atm1,v > retrieving revision 1.15 > diff -u -r1.15 atm1 > --- rc.d/atm1 7 Oct 2004 13:55:25 -0000 1.15 > +++ rc.d/atm1 12 Jun 2005 19:10:22 -0000 > @@ -30,7 +30,7 @@ > # PROVIDE: atm1 > # REQUIRE: root > # BEFORE: netif > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/atm2 > =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/atm2,v > retrieving revision 1.16 > diff -u -r1.16 atm2 > --- rc.d/atm2 7 Oct 2004 13:55:25 -0000 1.16 > +++ rc.d/atm2 12 Jun 2005 19:10:22 -0000 > @@ -30,7 +30,7 @@ > # PROVIDE: atm2 > # REQUIRE: atm1 netif > # BEFORE: routing > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > # > # Additional ATM interface configuration > Index: rc.d/ccd > =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/ccd,v > retrieving revision 1.5 > diff -u -r1.5 ccd > --- rc.d/ccd 7 Oct 2004 13:55:25 -0000 1.5 > +++ rc.d/ccd 12 Jun 2005 19:10:22 -0000 > @@ -5,7 +5,7 @@ > # > =20 > # PROVIDE: disks > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/cleanvar > =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/cleanvar,v > retrieving revision 1.8 > diff -u -r1.8 cleanvar > --- rc.d/cleanvar 14 Apr 2005 03:56:06 -0000 1.8 > +++ rc.d/cleanvar 12 Jun 2005 19:10:22 -0000 > @@ -5,6 +5,7 @@ > =20 > # PROVIDE: cleanvar > # REQUIRE: mountcritlocal var > +# KEYWORD: bootearly > =20 > purgedir() > { > Index: rc.d/devd > =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/devd,v > retrieving revision 1.7 > diff -u -r1.7 devd > --- rc.d/devd 7 Oct 2004 13:55:25 -0000 1.7 > +++ rc.d/devd 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > # PROVIDE: devd > # REQUIRE: NETWORKING > # BEFORE: mountcritremote > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/dumpon > =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/dumpon,v > retrieving revision 1.9 > diff -u -r1.9 dumpon > --- rc.d/dumpon 7 Jun 2005 15:20:10 -0000 1.9 > +++ rc.d/dumpon 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > # PROVIDE: dumpon > # REQUIRE: rcconf > # BEFORE: disks savecore initrandom > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/early.sh > =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/early.sh,v > retrieving revision 1.2 > diff -u -r1.2 early.sh > --- rc.d/early.sh 7 Oct 2004 13:55:25 -0000 1.2 > +++ rc.d/early.sh 12 Jun 2005 19:10:22 -0000 > @@ -6,6 +6,7 @@ > # PROVIDE: early > # REQUIRE: disks localswap > # BEFORE: fsck > +# KEYWORD: bootearly > =20 > # > # Support for legacy /etc/rc.early script > Index: rc.d/fsck > =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/fsck,v > retrieving revision 1.10 > diff -u -r1.10 fsck > --- rc.d/fsck 7 Oct 2004 13:55:25 -0000 1.10 > +++ rc.d/fsck 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > =20 > # PROVIDE: fsck > # REQUIRE: localswap > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/gbde > =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/gbde,v > retrieving revision 1.12 > diff -u -r1.12 gbde > --- rc.d/gbde 30 Jan 2005 11:04:13 -0000 1.12 > +++ rc.d/gbde 12 Jun 2005 19:10:22 -0000 > @@ -7,7 +7,7 @@ > # > =20 > # PROVIDE: disks > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/gbde_swap > =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/gbde_swap,v > retrieving revision 1.6 > diff -u -r1.6 gbde_swap > --- rc.d/gbde_swap 7 Oct 2004 13:55:25 -0000 1.6 > +++ rc.d/gbde_swap 12 Jun 2005 19:10:22 -0000 > @@ -5,7 +5,7 @@ > =20 > # PROVIDE: disks > # REQUIRE: initrandom > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/hostname > =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/hostname,v > retrieving revision 1.8 > diff -u -r1.8 hostname > --- rc.d/hostname 7 Oct 2004 13:55:25 -0000 1.8 > +++ rc.d/hostname 12 Jun 2005 19:10:22 -0000 > @@ -29,6 +29,7 @@ > # PROVIDE: hostname > # REQUIRE: mountcritlocal > # BEFORE: netif > +# KEYWORD: bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/initrandom > =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/initrandom,v > retrieving revision 1.5 > diff -u -r1.5 initrandom > --- rc.d/initrandom 2 Mar 2005 19:03:08 -0000 1.5 > +++ rc.d/initrandom 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > # PROVIDE: initrandom > # REQUIRE: rcconf > # BEFORE: disks > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/ip6addrctl > =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/ip6addrctl,v > retrieving revision 1.4 > diff -u -r1.4 ip6addrctl > --- rc.d/ip6addrctl 7 Oct 2004 13:55:26 -0000 1.4 > +++ rc.d/ip6addrctl 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > # PROVIDE: ip6addrctl > # REQUIRE: mountcritlocal netif > # BEFORE: network_ipv6 > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/ip6fw > =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/ip6fw,v > retrieving revision 1.6 > diff -u -r1.6 ip6fw > --- rc.d/ip6fw 7 Oct 2004 13:55:26 -0000 1.6 > +++ rc.d/ip6fw 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > # PROVIDE: ip6fw > # REQUIRE: routing > # BEFORE: network_ipv6 > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/ipfilter > =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/ipfilter,v > retrieving revision 1.22 > diff -u -r1.22 ipfilter > --- rc.d/ipfilter 7 Oct 2004 13:55:26 -0000 1.22 > +++ rc.d/ipfilter 12 Jun 2005 19:10:22 -0000 > @@ -7,7 +7,7 @@ > # PROVIDE: ipfilter > # REQUIRE: root mountcritlocal > # BEFORE: netif > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/ipfs > =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/ipfs,v > retrieving revision 1.6 > diff -u -r1.6 ipfs > --- rc.d/ipfs 7 Oct 2004 13:55:26 -0000 1.6 > +++ rc.d/ipfs 12 Jun 2005 19:10:22 -0000 > @@ -7,7 +7,7 @@ > # PROVIDE: ipfs > # REQUIRE: ipnat > # BEFORE: netif > -# KEYWORD: nojail shutdown > +# KEYWORD: nojail shutdown bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/ipfw > =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/ipfw,v > retrieving revision 1.10 > diff -u -r1.10 ipfw > --- rc.d/ipfw 16 Mar 2005 08:47:48 -0000 1.10 > +++ rc.d/ipfw 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > # PROVIDE: ipfw > # REQUIRE: ppp-user > # BEFORE: NETWORKING > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > . /etc/network.subr > Index: rc.d/ipnat > =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/ipnat,v > retrieving revision 1.14 > diff -u -r1.14 ipnat > --- rc.d/ipnat 7 Oct 2004 13:55:26 -0000 1.14 > +++ rc.d/ipnat 12 Jun 2005 19:10:22 -0000 > @@ -7,7 +7,7 @@ > # PROVIDE: ipnat > # REQUIRE: ipfilter > # BEFORE: DAEMON netif > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/isdnd > =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/isdnd,v > retrieving revision 1.20 > diff -u -r1.20 isdnd > --- rc.d/isdnd 16 Jan 2005 03:12:03 -0000 1.20 > +++ rc.d/isdnd 12 Jun 2005 19:10:22 -0000 > @@ -8,7 +8,7 @@ > =20 > # PROVIDE: isdnd > # REQUIRE: netif mountcritlocal cleanvar > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/kldxref > =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/kldxref,v > retrieving revision 1.4 > diff -u -r1.4 kldxref > --- rc.d/kldxref 7 Oct 2004 13:55:26 -0000 1.4 > +++ rc.d/kldxref 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > # PROVIDE: kldxref > # REQUIRE: root mountcritlocal > # BEFORE: netif > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/localpkg > =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/localpkg,v > retrieving revision 1.5 > diff -u -r1.5 localpkg > --- rc.d/localpkg 7 Oct 2004 13:55:26 -0000 1.5 > +++ rc.d/localpkg 12 Jun 2005 19:10:22 -0000 > @@ -14,6 +14,9 @@ > start_cmd=3D"pkg_start" > stop_cmd=3D"pkg_stop" > =20 > +rcorder_opts=3D"" > +[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && rcorder_opts=3D"-s n= ojail" > + > pkg_start() > { > # For each dir in $local_startup, search for init scripts matching *.sh > @@ -24,19 +27,14 @@ > *) > echo -n 'Local package initialization:' > slist=3D"" > - if [ -z "${script_name_sep}" ]; then > - script_name_sep=3D" " > - fi > + zlist=3D"" > for dir in ${local_startup}; do > if [ -d "${dir}" ]; then > - for script in ${dir}/*.sh; do > - slist=3D"${slist}${script_name_sep}${script}" > - done > + slist=3D"${slist} ${dir}/[^0-9]*.sh" > + zlist=3D"${zlist} ${dir}/[0-9]*.sh" > fi > done > - script_save_sep=3D"$IFS" > - IFS=3D"${script_name_sep}" > - for script in ${slist}; do > + for script in ${zlist} `rcorder -s nostart ${rcorder_opts} ${slist} 2>= /dev/null`; do > if [ -x "${script}" ]; then > (set -T > trap 'exit 1' 2 > @@ -45,7 +43,6 @@ > echo -n " (skipping ${script##*/}, not executable)" > fi > done > - IFS=3D"${script_save_sep}" > echo '.' > ;; > esac > @@ -61,26 +58,20 @@ > ;; > *) > slist=3D"" > - if [ -z "${script_name_sep}" ]; then > - script_name_sep=3D" " > - fi > + zlist=3D"" > for dir in ${local_startup}; do > if [ -d "${dir}" ]; then > - for script in ${dir}/*.sh; do > - slist=3D"${slist}${script_name_sep}${script}" > - done > + slist=3D"${slist} ${dir}/[^0-9]*.sh" > + zlist=3D"${zlist} ${dir}/[0-9]*.sh" > fi > done > - script_save_sep=3D"$IFS" > - IFS=3D"${script_name_sep}" > - for script in `reverse_list ${slist}`; do > + for script in `reverse_list ${zlist} \`rcorder -k shutdown ${rcorder_o= pts} ${slist} 2>/dev/null\``; do > if [ -x "${script}" ]; then > (set -T > trap 'exit 1' 2 > ${script} stop) > fi > done > - IFS=3D"${script_save_sep}" > echo '.' > ;; > esac > Index: rc.d/mountcritlocal > =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/mountcritlocal,v > retrieving revision 1.12 > diff -u -r1.12 mountcritlocal > --- rc.d/mountcritlocal 7 Oct 2004 13:55:26 -0000 1.12 > +++ rc.d/mountcritlocal 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > =20 > # PROVIDE: mountcritlocal > # REQUIRE: root > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/mountcritremote > =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/mountcritremote,v > retrieving revision 1.11 > diff -u -r1.11 mountcritremote > --- rc.d/mountcritremote 16 Jan 2005 03:12:03 -0000 1.11 > +++ rc.d/mountcritremote 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > =20 > # PROVIDE: mountcritremote > # REQUIRE: NETWORKING root mountcritlocal cleanvar > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/mroute6d > =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/mroute6d,v > retrieving revision 1.4 > diff -u -r1.4 mroute6d > --- rc.d/mroute6d 7 Oct 2004 13:55:26 -0000 1.4 > +++ rc.d/mroute6d 12 Jun 2005 19:10:22 -0000 > @@ -5,7 +5,7 @@ > =20 > # PROVIDE: mroute6d > # REQUIRE: network_ipv6 > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/mrouted > =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/mrouted,v > retrieving revision 1.9 > diff -u -r1.9 mrouted > --- rc.d/mrouted 16 Jan 2005 03:12:03 -0000 1.9 > +++ rc.d/mrouted 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > =20 > # PROVIDE: mrouted > # REQUIRE: netif routing cleanvar > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/netif > =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/netif,v > retrieving revision 1.13 > diff -u -r1.13 netif > --- rc.d/netif 7 Jun 2005 04:49:12 -0000 1.13 > +++ rc.d/netif 12 Jun 2005 19:10:22 -0000 > @@ -27,7 +27,7 @@ > =20 > # PROVIDE: netif > # REQUIRE: atm1 ipfilter mountcritlocal pccard serial sppp sysctl > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > . /etc/network.subr > Index: rc.d/network_ipv6 > =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/network_ipv6,v > retrieving revision 1.37 > diff -u -r1.37 network_ipv6 > --- rc.d/network_ipv6 7 Oct 2004 13:55:26 -0000 1.37 > +++ rc.d/network_ipv6 12 Jun 2005 19:10:22 -0000 > @@ -30,7 +30,7 @@ > =20 > # PROVIDE: network_ipv6 > # REQUIRE: routing > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > . /etc/network.subr > Index: rc.d/nsswitch > =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/nsswitch,v > retrieving revision 1.5 > diff -u -r1.5 nsswitch > --- rc.d/nsswitch 7 Oct 2004 13:55:26 -0000 1.5 > +++ rc.d/nsswitch 12 Jun 2005 19:10:22 -0000 > @@ -29,6 +29,7 @@ > # PROVIDE: nsswitch > # REQUIRE: root > # BEFORE: NETWORK > +# KEYWORD: bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/pccard > =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/pccard,v > retrieving revision 1.30 > diff -u -r1.30 pccard > --- rc.d/pccard 7 Oct 2004 13:55:26 -0000 1.30 > +++ rc.d/pccard 12 Jun 2005 19:10:22 -0000 > @@ -29,7 +29,7 @@ > =20 > # PROVIDE: pccard > # REQUIRE: mountcritlocal > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/ppp-user > =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/ppp-user,v > retrieving revision 1.7 > diff -u -r1.7 ppp-user > --- rc.d/ppp-user 15 Dec 2004 12:39:28 -0000 1.7 > +++ rc.d/ppp-user 12 Jun 2005 19:10:22 -0000 > @@ -5,7 +5,7 @@ > =20 > # PROVIDE: ppp-user > # REQUIRE: netif isdnd > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/ramdisk > =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/ramdisk,v > retrieving revision 1.4 > diff -u -r1.4 ramdisk > --- rc.d/ramdisk 7 Oct 2004 13:55:26 -0000 1.4 > +++ rc.d/ramdisk 12 Jun 2005 19:10:22 -0000 > @@ -30,6 +30,7 @@ > # PROVIDE: ramdisk > # REQUIRE: localswap > # BEFORE: mountcritlocal > +# KEYWORD: bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/random > =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/random,v > retrieving revision 1.8 > diff -u -r1.8 random > --- rc.d/random 11 Apr 2005 02:45:05 -0000 1.8 > +++ rc.d/random 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > # PROVIDE: random > # REQUIRE: var initrandom > # BEFORE: netif > -# KEYWORD: nojail shutdown > +# KEYWORD: nojail shutdown bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/rcconf.sh > =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/rcconf.sh,v > retrieving revision 1.4 > diff -u -r1.4 rcconf.sh > --- rc.d/rcconf.sh 29 Apr 2005 23:02:56 -0000 1.4 > +++ rc.d/rcconf.sh 12 Jun 2005 19:10:22 -0000 > @@ -5,6 +5,7 @@ > =20 > # PROVIDE: rcconf > # BEFORE: disks initrandom > +# KEYWORD: bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/root > =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/root,v > retrieving revision 1.10 > diff -u -r1.10 root > --- rc.d/root 7 Oct 2004 13:55:26 -0000 1.10 > +++ rc.d/root 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > =20 > # PROVIDE: root > # REQUIRE: fsck > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/route6d > =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/route6d,v > retrieving revision 1.9 > diff -u -r1.9 route6d > --- rc.d/route6d 7 Oct 2004 13:55:26 -0000 1.9 > +++ rc.d/route6d 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > =20 > # PROVIDE: route6d > # REQUIRE: network_ipv6 > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/routed > =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/routed,v > retrieving revision 1.12 > diff -u -r1.12 routed > --- rc.d/routed 7 Oct 2004 13:55:26 -0000 1.12 > +++ rc.d/routed 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > =20 > # PROVIDE: routed > # REQUIRE: netif routing > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/routing > =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/routing,v > retrieving revision 1.141 > diff -u -r1.141 routing > --- rc.d/routing 7 Oct 2004 13:55:26 -0000 1.141 > +++ rc.d/routing 12 Jun 2005 19:10:22 -0000 > @@ -7,7 +7,7 @@ > =20 > # PROVIDE: routing > # REQUIRE: netif ppp-user > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/serial > =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/serial,v > retrieving revision 1.24 > diff -u -r1.24 serial > --- rc.d/serial 14 Nov 2004 19:51:34 -0000 1.24 > +++ rc.d/serial 12 Jun 2005 19:10:22 -0000 > @@ -29,7 +29,7 @@ > =20 > # PROVIDE: serial > # REQUIRE: root > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > # Change some defaults for serial devices. > # Standard defaults are: > Index: rc.d/sppp > =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/sppp,v > retrieving revision 1.4 > diff -u -r1.4 sppp > --- rc.d/sppp 7 Oct 2004 13:55:26 -0000 1.4 > +++ rc.d/sppp 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > # PROVIDE: sppp > # REQUIRE: root > # BEFORE: netif > -# KEYWORD: nojail > +# KEYWORD: nojail bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/swap1 > =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/swap1,v > retrieving revision 1.9 > diff -u -r1.9 swap1 > --- rc.d/swap1 5 Nov 2004 12:38:27 -0000 1.9 > +++ rc.d/swap1 12 Jun 2005 19:10:22 -0000 > @@ -6,7 +6,7 @@ > =20 > # PROVIDE: localswap > # REQUIRE: disks > -# KEYWORD: nojail shutdown > +# KEYWORD: nojail shutdown bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/sysctl > =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/sysctl,v > retrieving revision 1.16 > diff -u -r1.16 sysctl > --- rc.d/sysctl 7 Oct 2004 13:55:26 -0000 1.16 > +++ rc.d/sysctl 12 Jun 2005 19:10:22 -0000 > @@ -7,6 +7,7 @@ > # PROVIDE: sysctl > # REQUIRE: root > # BEFORE: DAEMON > +# KEYWORD: bootearly > =20 > . /etc/rc.subr > =20 > Index: rc.d/var > =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/var,v > retrieving revision 1.40 > diff -u -r1.40 var > --- rc.d/var 2 Mar 2005 16:41:35 -0000 1.40 > +++ rc.d/var 12 Jun 2005 19:10:22 -0000 > @@ -29,6 +29,7 @@ > =20 > # PROVIDE: var > # REQUIRE: mountcritlocal > +# KEYWORD: bootearly > =20 > . /etc/rc.subr > =20 --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --ZGiS0Q5IWpPtfppv Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFCrNmEXY6L6fI4GtQRAu7XAJ4t8UrP9lkz+MiNjcMOt39AYYFMOACgprzf uRXeS3VFLu/5ODq3AOlFh/8= =3+hC -----END PGP SIGNATURE----- --ZGiS0Q5IWpPtfppv-- From owner-freebsd-rc@FreeBSD.ORG Mon Jun 13 05:29:50 2005 Return-Path: X-Original-To: freebsd-rc@freebsd.org Delivered-To: freebsd-rc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 80A8016A41C for ; Mon, 13 Jun 2005 05:29:50 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: from mail1.fluidhosting.com (mail1.fluidhosting.com [66.150.201.101]) by mx1.FreeBSD.org (Postfix) with SMTP id 1203743D55 for ; Mon, 13 Jun 2005 05:29:49 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: (qmail 44474 invoked by uid 399); 13 Jun 2005 05:29:49 -0000 Received: from unknown (HELO ?192.168.15.101?) (dougb@dougbarton.net@67.20.70.103) by mail1.fluidhosting.com with SMTP; 13 Jun 2005 05:29:49 -0000 Message-ID: <42AD19C9.2040403@FreeBSD.org> Date: Sun, 12 Jun 2005 22:29:45 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Mozilla Thunderbird 1.0.2 (X11/20050326) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Brooks Davis References: <20050607173741.GI11758@odin.ac.hmc.edu> <20050607191109.GU37208@linwhf.opal.com> <20050608233802.GA29707@odin.ac.hmc.edu> <20050609003459.GK37208@linwhf.opal.com> <20050609050517.GA28710@odin.ac.hmc.edu> <42A89CD7.1080404@FreeBSD.org> <20050609201017.GA10248@odin.ac.hmc.edu> <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg> <20050613005533.GA28966@odin.ac.hmc.edu> In-Reply-To: <20050613005533.GA28966@odin.ac.hmc.edu> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-rc@freebsd.org, "J.R. Oldroyd" Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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: Mon, 13 Jun 2005 05:29:50 -0000 Brooks Davis wrote: > I don't like the idea of tagging all the scripts. First, it makes the > update suck. rm /etc/rc.d/* ; mergemaster -i I understand that this mechanism is a little more invasive, but it uses the existing rc.d framework without adding too much additional code. Also, using keywords makes this really easy to work around, since keywords are harmless if they aren't actually invoked. > Second, that's a lot > places to keep state up to date. JR's proposal of using a marker script > had the downside of adding slightly more code to /etc/rc, but the > advantage of not having to keep all the files in the right place. I'm not sure what you mean by "a lot of places to keep state." This is a one-time modification, and any scripts that we need to add to bootearly are easily added. The disadvantage to a marker script is that if some other dependency gets juggled in another script, the marker could run in a different order. By using keywords we can be 100% sure what will happen in each phase. > The local_startup collector looks pretty good. Thanks. > I'm not 100% how I feel > about the *.sample exception. On one hand it seems like the safest > thing to do, on the other hand, it's the sort of feature that tends to > hang on forever. I would say that's accurate. :) I think that when we get farther down the road of the conversion (and we can be sure that things won't start accidentally if the user doesn't put the right things in /etc/rc.conf[.local]) then we can carp on this more. > I'd be slightly inclined to complain about .sample > scripts that are executable to try and get people to stop installing > them. We should almost certainly complain about script that aren't *.sh > that are not executable. Effectivly those will all be all port bugs. I agree, but my preference would be that we also hold off on this till we're further down the road of the transition. I'm flexible on all this stuff though, let me know what you think. Doug -- This .signature sanitized for your protection From owner-freebsd-rc@FreeBSD.ORG Mon Jun 13 11:02:15 2005 Return-Path: X-Original-To: freebsd-rc@freebsd.org Delivered-To: freebsd-rc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01BF416A420 for ; Mon, 13 Jun 2005 11:02:15 +0000 (GMT) (envelope-from owner-bugmaster@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E81443D58 for ; Mon, 13 Jun 2005 11:02:14 +0000 (GMT) (envelope-from owner-bugmaster@freebsd.org) Received: from freefall.freebsd.org (peter@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j5DB2Ecu046250 for ; Mon, 13 Jun 2005 11:02:14 GMT (envelope-from owner-bugmaster@freebsd.org) Received: (from peter@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5DB2DbS046244 for freebsd-rc@freebsd.org; Mon, 13 Jun 2005 11:02:13 GMT (envelope-from owner-bugmaster@freebsd.org) Date: Mon, 13 Jun 2005 11:02:13 GMT Message-Id: <200506131102.j5DB2DbS046244@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: peter set sender to owner-bugmaster@freebsd.org using -f From: FreeBSD bugmaster To: freebsd-rc@FreeBSD.org Cc: Subject: Current problem reports assigned to you 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: Mon, 13 Jun 2005 11:02:15 -0000 Current FreeBSD problem reports Critical problems Serious problems S Submitted Tracker Resp. Description ------------------------------------------------------------------------------- a [2004/03/09] kern/63954 rc devfs loses permissions o [2005/02/10] conf/77340 rc awk used in /etc/rc.d/nsswitch when not a 2 problems total. Non-critical problems S Submitted Tracker Resp. Description ------------------------------------------------------------------------------- o [2003/08/29] conf/56144 rc [PATCH] /etc/rc.d/ipmon, /etc/rc.d/ipfilt o [2004/06/30] conf/68525 rc Loader's verbose boot mode has rc.d/local o [2004/07/07] conf/68745 rc /etc/rc.d/devfs runs after ntpd so links o [2005/04/22] conf/80244 rc [PATCH] rc.conf + rc.d/jail should enable o [2005/05/14] kern/81006 rc ipnat not working with tunnel interfaces 5 problems total. From owner-freebsd-rc@FreeBSD.ORG Mon Jun 13 15:52:12 2005 Return-Path: X-Original-To: freebsd-rc@FreeBSD.org Delivered-To: freebsd-rc@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46E2816A41C; Mon, 13 Jun 2005 15:52:12 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id F119043D1F; Mon, 13 Jun 2005 15:52:11 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id j5DFqBn8022107; Mon, 13 Jun 2005 08:52:11 -0700 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id j5DFqBGV022106; Mon, 13 Jun 2005 08:52:11 -0700 Date: Mon, 13 Jun 2005 08:52:11 -0700 From: Brooks Davis To: Doug Barton Message-ID: <20050613155211.GB19722@odin.ac.hmc.edu> References: <20050608233802.GA29707@odin.ac.hmc.edu> <20050609003459.GK37208@linwhf.opal.com> <20050609050517.GA28710@odin.ac.hmc.edu> <42A89CD7.1080404@FreeBSD.org> <20050609201017.GA10248@odin.ac.hmc.edu> <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg> <20050613005533.GA28966@odin.ac.hmc.edu> <42AD19C9.2040403@FreeBSD.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="jho1yZJdad60DJr+" Content-Disposition: inline In-Reply-To: <42AD19C9.2040403@FreeBSD.org> User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu Cc: freebsd-rc@FreeBSD.org, "J.R. Oldroyd" Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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: Mon, 13 Jun 2005 15:52:12 -0000 --jho1yZJdad60DJr+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 12, 2005 at 10:29:45PM -0700, Doug Barton wrote: > Brooks Davis wrote: >=20 > >I don't like the idea of tagging all the scripts. First, it makes the > >update suck. >=20 > rm /etc/rc.d/* ; mergemaster -i >=20 > I understand that this mechanism is a little more invasive, but it uses t= he=20 > existing rc.d framework without adding too much additional code. Also,=20 > using keywords makes this really easy to work around, since keywords are= =20 > harmless if they aren't actually invoked. I know about this workaround. It's fine unless you've modified even a single script. > >Second, that's a lot > >places to keep state up to date. JR's proposal of using a marker script > >had the downside of adding slightly more code to /etc/rc, but the > >advantage of not having to keep all the files in the right place. >=20 > I'm not sure what you mean by "a lot of places to keep state." This is a= =20 > one-time modification, and any scripts that we need to add to bootearly a= re=20 > easily added. The disadvantage to a marker script is that if some other= =20 > dependency gets juggled in another script, the marker could run in a=20 > different order. By using keywords we can be 100% sure what will happen i= n=20 > each phase. What I like about the marker script is that dependency changes still work. I don't want to have to figure out every script that needs to change if I add "# BEFORE: mountcritremote" to a script or if I change a script that previously ran before mountcritremote to run after it. This is the strength of rc.d. Down the path of adding tags to indiacte startup order lies SysV init. That's not all bad, but I'd like to think we chose rc.d over SysV init because it was better not because it was less SysV. > >The local_startup collector looks pretty good.=20 >=20 > Thanks. >=20 > > I'm not 100% how I feel > >about the *.sample exception. On one hand it seems like the safest > >thing to do, on the other hand, it's the sort of feature that tends to > >hang on forever.=20 >=20 > I would say that's accurate. :) I think that when we get farther down the= =20 > road of the conversion (and we can be sure that things won't start=20 > accidentally if the user doesn't put the right things in=20 > /etc/rc.conf[.local]) then we can carp on this more. >=20 > >I'd be slightly inclined to complain about .sample > >scripts that are executable to try and get people to stop installing > >them. We should almost certainly complain about script that aren't *.sh > >that are not executable. Effectivly those will all be all port bugs. >=20 > I agree, but my preference would be that we also hold off on this till=20 > we're further down the road of the transition. I'm flexible on all this= =20 > stuff though, let me know what you think. I generally prefer to complain early. The sooner we ship a release that gripes, the sooner the users start beating up on port maintiners to make the warning go away. :-) We can't generally drop support for "features" until we've warned for a good part of a branch. I'd like see warnings about older scripts by the time 6.x goes production ready. -- Brooks --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --jho1yZJdad60DJr+ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFCrauqXY6L6fI4GtQRAoK0AJ4yT9ReWnBsuKnbuR9tiDI6lzyMwQCfcteI cpOB8bx6UDUIoiuSQTVWaAo= =xM69 -----END PGP SIGNATURE----- --jho1yZJdad60DJr+-- From owner-freebsd-rc@FreeBSD.ORG Tue Jun 14 13:47:54 2005 Return-Path: X-Original-To: freebsd-rc@FreeBSD.org Delivered-To: freebsd-rc@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 81BC916A41C; Tue, 14 Jun 2005 13:47:54 +0000 (GMT) (envelope-from jr@opal.com) Received: from smtp.vzavenue.net (smtp.vzavenue.net [66.171.59.140]) by mx1.FreeBSD.org (Postfix) with ESMTP id C81F543D48; Tue, 14 Jun 2005 13:47:51 +0000 (GMT) (envelope-from jr@opal.com) Received: from linwhf.opal.com (112.79.171.66.subscriber.vzavenue.net [66.171.79.112]) by smtp.vzavenue.net (MOS 3.4.8-GR) with ESMTP id CJR07474; Tue, 14 Jun 2005 09:47:32 -0400 (EDT) Received: from ASSP-nospam (localhost [127.0.0.1]) by linwhf.opal.com (8.13.3/8.13.3) with ESMTP id j5EDlWX5017045; Tue, 14 Jun 2005 09:47:32 -0400 (EDT) (envelope-from jr@opal.com) Received: from 127.0.0.1 ([127.0.0.1] helo=linwhf.opal.com) by ASSP-nospam ; 14 Jun 05 13:47:32 -0000 Received: (from jr@localhost) by linwhf.opal.com (8.13.3/8.13.3/Submit) id j5EDlWfr017044; Tue, 14 Jun 2005 09:47:32 -0400 (EDT) (envelope-from jr) Date: Tue, 14 Jun 2005 09:47:32 -0400 From: "J.R. Oldroyd" To: Brooks Davis Message-ID: <20050614134732.GB16676@linwhf.opal.com> References: <20050609003459.GK37208@linwhf.opal.com> <20050609050517.GA28710@odin.ac.hmc.edu> <42A89CD7.1080404@FreeBSD.org> <20050609201017.GA10248@odin.ac.hmc.edu> <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg> <20050613005533.GA28966@odin.ac.hmc.edu> <42AD19C9.2040403@FreeBSD.org> <20050613155211.GB19722@odin.ac.hmc.edu> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="SLDf9lqlvOQaIe6s" Content-Disposition: inline In-Reply-To: <20050613155211.GB19722@odin.ac.hmc.edu> User-Agent: Mutt/1.4.2.1i X-Junkmail-Status: score=0/50, host=smtp.vzavenue.net Cc: Doug Barton , freebsd-rc@FreeBSD.org Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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: Tue, 14 Jun 2005 13:47:54 -0000 --SLDf9lqlvOQaIe6s Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable It seems to me that TWO changes will be needed to make this transition. The transition modifies the semantics of how files in the local rc.d dirs are handled. Right now, local "foo.sh" files are executed in a subshell. After we're done, we want "foo" to be executed in a subshell and "foo.sh" to be sourced. There are possible negative consequences of sourcing all "foo.sh" files, so two changes will probably be needed, one now in the short term which adds the rcordering capability and preserves other semantics, and one later on which brings all semantics into line. Something like this: A. NOW: /etc/rc.d rcordered with "foo" run in subshell and "foo.sh" sourced local dirs "foo.sh" run in subshell from localpkg in alphabetical order B. SOON: /etc/rc.d rcordered with "foo" run in subshell and "foo.sh" sourced local dirs "[0-9]foo.sh" scripts are run in a subshell first, then "[^0-9]foo.sh" and executable "[^0-9]foo" scripts run rcordered and run in subshells; "foo.xyz" (e.g., ".sample") ignored? ACTION required of port maintainers: NONE C. AT FUTURE FLAGDAY: /etc/rc.d+local rcordered with "foo" run in subshell and "foo.sh" sourced; "foo.xyz" files now treated as "foo" ACTION required of port maintainers: - add rcorder tags to all scripts - rename "foo.sh" to "foo" unless sourced behavior is desired - rename "[0-9]foo.sh" scripts to something more suitable - move "foo.xyz" (e.g., ".sample") files elsewhere My thought is that to oblige port maintainers to make changes in the short term will be hard. Give them some time (between points B. and C. and acceptance of the change will be a lot easier). So let's provide intermediate rc, rc.subr and localpkg scripts that may be larger and more complex, but which don't place an immediate burden on 13,000 port maintainers. Then provide a final set of scripts which do. The intermediate scripts can provide warning messages that alert that a change may be needed. -jr On Jun 13, 08:52, Brooks Davis wrote: > On Sun, Jun 12, 2005 at 10:29:45PM -0700, Doug Barton wrote: > > Brooks Davis wrote: > >=20 > > >I don't like the idea of tagging all the scripts. First, it makes the > > >update suck. > >=20 > > rm /etc/rc.d/* ; mergemaster -i > >=20 > > I understand that this mechanism is a little more invasive, but it uses= the=20 > > existing rc.d framework without adding too much additional code. Also,= =20 > > using keywords makes this really easy to work around, since keywords ar= e=20 > > harmless if they aren't actually invoked. >=20 > I know about this workaround. It's fine unless you've modified even a > single script. >=20 > > >Second, that's a lot > > >places to keep state up to date. JR's proposal of using a marker scri= pt > > >had the downside of adding slightly more code to /etc/rc, but the > > >advantage of not having to keep all the files in the right place. > >=20 > > I'm not sure what you mean by "a lot of places to keep state." This is = a=20 > > one-time modification, and any scripts that we need to add to bootearly= are=20 > > easily added. The disadvantage to a marker script is that if some other= =20 > > dependency gets juggled in another script, the marker could run in a=20 > > different order. By using keywords we can be 100% sure what will happen= in=20 > > each phase. >=20 > What I like about the marker script is that dependency changes still > work. I don't want to have to figure out every script that needs to > change if I add "# BEFORE: mountcritremote" to a script or if I change a > script that previously ran before mountcritremote to run after it. This > is the strength of rc.d. Down the path of adding tags to indiacte > startup order lies SysV init. That's not all bad, but I'd like to think > we chose rc.d over SysV init because it was better not because it was > less SysV. >=20 > > >The local_startup collector looks pretty good.=20 > >=20 > > Thanks. > >=20 > > > I'm not 100% how I feel > > >about the *.sample exception. On one hand it seems like the safest > > >thing to do, on the other hand, it's the sort of feature that tends to > > >hang on forever.=20 > >=20 > > I would say that's accurate. :) I think that when we get farther down t= he=20 > > road of the conversion (and we can be sure that things won't start=20 > > accidentally if the user doesn't put the right things in=20 > > /etc/rc.conf[.local]) then we can carp on this more. > >=20 > > >I'd be slightly inclined to complain about .sample > > >scripts that are executable to try and get people to stop installing > > >them. We should almost certainly complain about script that aren't *.= sh > > >that are not executable. Effectivly those will all be all port bugs. > >=20 > > I agree, but my preference would be that we also hold off on this till= =20 > > we're further down the road of the transition. I'm flexible on all this= =20 > > stuff though, let me know what you think. >=20 > I generally prefer to complain early. The sooner we ship a release that > gripes, the sooner the users start beating up on port maintiners to make > the warning go away. :-) We can't generally drop support for "features" > until we've warned for a good part of a branch. I'd like see warnings > about older scripts by the time 6.x goes production ready. >=20 > -- Brooks >=20 > --=20 > Any statement of the form "X is the one, true Y" is FALSE. > PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --SLDf9lqlvOQaIe6s Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (FreeBSD) iQDVAwUBQq7f80kkqUax7f6FAQLn7gX/Zs7O1dhC1LKzefN+aUVXk2X/tTt/3ptJ TfNYDv2CF/g8l0uBUZgybzjUL0lvQXO4ivm+oWNd+90MSB0zz10Exz7+SoZL323b 2lUu8QIa99uwf5dezZDAycUjKEJDTB8UZ2ttwgOOtOq3xRlmeD4Zzy834yf0jR+a q0dsIfuxc3MgXaTmsflMTQ3GuiXXLg/y7hhxCgheopVj20GeM1YAAEQUDsMISz+Y 9yMM9z1iqrCyTNIRRdveXPS25mbuWuPZ =nRXM -----END PGP SIGNATURE----- --SLDf9lqlvOQaIe6s-- From owner-freebsd-rc@FreeBSD.ORG Tue Jun 14 15:01:14 2005 Return-Path: X-Original-To: freebsd-rc@freebsd.org Delivered-To: freebsd-rc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7F3E16A41C for ; Tue, 14 Jun 2005 15:01:14 +0000 (GMT) (envelope-from jmartin37@speakeasy.net) Received: from mail26.sea5.speakeasy.net (mail26.sea5.speakeasy.net [69.17.117.28]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88DB743D53 for ; Tue, 14 Jun 2005 15:01:14 +0000 (GMT) (envelope-from jmartin37@speakeasy.net) Received: (qmail 4292 invoked from network); 14 Jun 2005 15:01:14 -0000 Received: from adsl-211-141-154.asm.bellsouth.net (HELO [192.168.2.101]) (moonlightcheese@[68.211.141.154]) (envelope-sender ) by mail26.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 14 Jun 2005 15:01:13 -0000 Message-ID: <42AEF135.6000605@speakeasy.net> Date: Tue, 14 Jun 2005 11:01:09 -0400 From: JM User-Agent: Mozilla Thunderbird 1.0.2-1.3.3 (X11/20050513) X-Accept-Language: en-us, en MIME-Version: 1.0 To: freebsd-rc@freebsd.org Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: rcNG script problems 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: Tue, 14 Jun 2005 15:01:14 -0000 i've written an rcNG script but i'm having some issues. i've read all of the documentation and searched in the mailing lists and didn't find anything about writting custom rcNG scripts. i've built apache2 and PHP5 from source (not from ports) so i had to write my own script to start httpd at boot. i'm having trouble with it and this is my first attempt at an rcNG script. the script name is 'httpd_start' and the perms are 555, owner root group wheel, same as all the other scripts. here is the code: [code] #!/bin/sh # # PROVIDE: httpd_start # REQUIRE: LOGIN httpd_start_enable=${httpd_start_enable-"YES"} httpd_start_flags=${httpd_start_flags-""} . /etc/rc.subr name="httpd_start" rcvar=`set_rcvar` command="/var/www/bin/apachectl" args="start" start_cmd="echo \"Starting Apache\"; ${command} ${args}" stop_cmd="/var/www/bin/apachectl stop" load_rc_config $name run_rc_command="$1" [/code] and here is the entry in rc.conf: [code] httpd_start_enable="YES" [/code] can't figure this one out. is this not the way we're supposed to write rc scripts? this was copied straight from the man pages. i don't understand why it isn't working... From owner-freebsd-rc@FreeBSD.ORG Tue Jun 14 17:27:41 2005 Return-Path: X-Original-To: freebsd-rc@FreeBSD.org Delivered-To: freebsd-rc@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A32A416A41C; Tue, 14 Jun 2005 17:27:41 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7036943D48; Tue, 14 Jun 2005 17:27:41 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id j5EHReMW028698; Tue, 14 Jun 2005 10:27:40 -0700 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id j5EHRee2028697; Tue, 14 Jun 2005 10:27:40 -0700 Date: Tue, 14 Jun 2005 10:27:40 -0700 From: Brooks Davis To: "J.R. Oldroyd" Message-ID: <20050614172740.GC20371@odin.ac.hmc.edu> References: <20050609050517.GA28710@odin.ac.hmc.edu> <42A89CD7.1080404@FreeBSD.org> <20050609201017.GA10248@odin.ac.hmc.edu> <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg> <20050613005533.GA28966@odin.ac.hmc.edu> <42AD19C9.2040403@FreeBSD.org> <20050613155211.GB19722@odin.ac.hmc.edu> <20050614134732.GB16676@linwhf.opal.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="pAwQNkOnpTn9IO2O" Content-Disposition: inline In-Reply-To: <20050614134732.GB16676@linwhf.opal.com> User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu Cc: Doug Barton , freebsd-rc@FreeBSD.org Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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: Tue, 14 Jun 2005 17:27:41 -0000 --pAwQNkOnpTn9IO2O Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jun 14, 2005 at 09:47:32AM -0400, J.R. Oldroyd wrote: > It seems to me that TWO changes will be needed to make this transition. > The transition modifies the semantics of how files in the local rc.d > dirs are handled. >=20 > Right now, local "foo.sh" files are executed in a subshell. >=20 > After we're done, we want "foo" to be executed in a subshell and > "foo.sh" to be sourced. There are possible negative consequences > of sourcing all "foo.sh" files, so two changes will probably be > needed, one now in the short term which adds the rcordering > capability and preserves other semantics, and one later on which > brings all semantics into line. Something like this: I think this is a sensable proposal. B or a similar variant should be easily achievable by 6.0 and a fuller version could probably be available for the first "production ready" release slated for January.=20 > A. NOW: > /etc/rc.d rcordered with "foo" run in subshell and > "foo.sh" sourced > local dirs "foo.sh" run in subshell from localpkg > in alphabetical order >=20 > B. SOON: > /etc/rc.d rcordered with "foo" run in subshell and > "foo.sh" sourced > local dirs "[0-9]foo.sh" scripts are run in a subshell > first, then "[^0-9]foo.sh" and executable > "[^0-9]foo" scripts run rcordered and run in > subshells; "foo.xyz" (e.g., ".sample") ignored? > ACTION required of port maintainers: NONE One concern I have here is what does first mean? It seems like we may need to run as early as immediatly after mountcritremote which does change the order a bit and would require a new rc script, something like localpkg-early. I'm not quite sure about the exclusions for rcorder. The *.* exclusion seems like an easy way to avoid *.sh, *.sample, *.orig, *.bak, etc. I'm not sure what the point of the [^0-9] is though, it would seem that the logical migration path would be for users to add appropriate dependency tags to their scripts and set a ports Makefile variable to cause the .sh to be stripped when installing on appropriate versions of FreeBSD. Removing the ### bits could be done after the flagday. I'd be strongly tempted to require the documented rcorder pattern be matched by the script in addition to the other exclustions. We should have egrep at this point so that should be easy. I'd like to whine about any files that aren't run, probalby in localpkg. It's fairly easy to do and would provide a push to get rid of the various .sample bits. > C. AT FUTURE FLAGDAY: > /etc/rc.d+local rcordered with "foo" run in subshell and > "foo.sh" sourced; "foo.xyz" files now treated > as "foo" > ACTION required of port maintainers: > - add rcorder tags to all scripts > - rename "foo.sh" to "foo" unless sourced > behavior is desired I think we should be able to automate this via USE_RC_SUBR and/or RC_ORDER. > - rename "[0-9]foo.sh" scripts to something > more suitable > - move "foo.xyz" (e.g., ".sample") files > elsewhere In preperation for this, it would be helpful if we could write port post-install checks that kris could use to generate lists of ports that need to be moved to the new standard. There's no need to do this now, but it's something to keep in mind. > My thought is that to oblige port maintainers to make changes in > the short term will be hard. Give them some time (between points > B. and C. and acceptance of the change will be a lot easier). >=20 > So let's provide intermediate rc, rc.subr and localpkg scripts that > may be larger and more complex, but which don't place an immediate > burden on 13,000 port maintainers. Then provide a final set of > scripts which do. The intermediate scripts can provide warning > messages that alert that a change may be needed. I agree. I'd like to do the spadework to make the major benefits available for 6.0 and then take the time between 6.0 and 7.0 to work towards the flag day. There's no reason not to make the full transition in ports before 7.0 so all the flagday does is make old junk stop working, as long as we do the work to warn about old style bits from the beginning. -- Brooks --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --pAwQNkOnpTn9IO2O Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFCrxOLXY6L6fI4GtQRAtXqAJ9ZMbCk8yEy8LdJoevbYmjHFfw/9gCfdtQD KkAZNWDsRnJ3mgI06/fB3rM= =WYF1 -----END PGP SIGNATURE----- --pAwQNkOnpTn9IO2O-- From owner-freebsd-rc@FreeBSD.ORG Tue Jun 14 19:40:01 2005 Return-Path: X-Original-To: freebsd-rc@freebsd.org Delivered-To: freebsd-rc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B3B9516A41F for ; Tue, 14 Jun 2005 19:40:01 +0000 (GMT) (envelope-from jmartin37@speakeasy.net) Received: from mail27.sea5.speakeasy.net (mail27.sea5.speakeasy.net [69.17.117.29]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74AAB43D1F for ; Tue, 14 Jun 2005 19:40:01 +0000 (GMT) (envelope-from jmartin37@speakeasy.net) Received: (qmail 18343 invoked from network); 14 Jun 2005 19:40:01 -0000 Received: from adsl-211-141-154.asm.bellsouth.net (HELO [192.168.2.101]) (moonlightcheese@[68.211.141.154]) (envelope-sender ) by mail27.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 14 Jun 2005 19:40:01 -0000 Message-ID: <42AF328D.8090502@speakeasy.net> Date: Tue, 14 Jun 2005 15:39:57 -0400 From: JM User-Agent: Mozilla Thunderbird 1.0.2-1.3.3 (X11/20050513) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Kirk Strauser References: <42AF0EDD.4090100@speakeasy.net> <200506141342.07886.kirk@strauser.com> In-Reply-To: <200506141342.07886.kirk@strauser.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-rc@freebsd.org, freebsd-questions@freebsd.org Subject: Re: rcNG script problems 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: Tue, 14 Jun 2005 19:40:01 -0000 Kirk Strauser wrote: >On Tuesday 14 June 2005 12:07, JM wrote: > > >>i've written an rcNG script but i'm having some issues. >> >> > >Step one: set rc_debug="YES" in /etc/rc.conf to see what's actually >happening when you attempt to run your script. That seems to uncover about >95% of the problems I've had. > > turned on the option rc_debug="YES" and ran 'dmesg -a'... the script doesn't even show up in the list anywhere. are we not supposed to be able to write custom rcNG scripts? is there something i'm overlooking where i need to register httpd_start in the rc stuff? here's my newbie impression of how rc works: - rc i run by init - rc runs rcorder on all script directories. - rc reads rc.conf and runs all scripts found by rcorder rcorder recognizes the script i wrote without any errors... yet when i boot the system, there is no "checkyesno" for httpd_start. there's nothing that references the script at all... WHY? >.< why did FreeBSD have to adopt this standard anyhow? it seems unnecessarily complicated to write custom scripts now. From owner-freebsd-rc@FreeBSD.ORG Tue Jun 14 19:46:38 2005 Return-Path: X-Original-To: freebsd-rc@freebsd.org Delivered-To: freebsd-rc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7433316A41C; Tue, 14 Jun 2005 19:46:38 +0000 (GMT) (envelope-from chad@shire.net) Received: from hobbiton.shire.net (hobbiton.shire.net [166.70.252.250]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37EB543D1D; Tue, 14 Jun 2005 19:46:38 +0000 (GMT) (envelope-from chad@shire.net) Received: from [67.161.222.227] (helo=[192.168.99.68]) by hobbiton.shire.net with esmtpa (Exim 4.51) id 1DiHMq-000LhY-Mn; Tue, 14 Jun 2005 13:46:37 -0600 In-Reply-To: <42AF328D.8090502@speakeasy.net> References: <42AF0EDD.4090100@speakeasy.net> <200506141342.07886.kirk@strauser.com> <42AF328D.8090502@speakeasy.net> Mime-Version: 1.0 (Apple Message framework v730) Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: Content-Transfer-Encoding: 7bit From: "Chad Leigh -- Shire.Net LLC" Date: Tue, 14 Jun 2005 13:46:35 -0600 To: JM X-Mailer: Apple Mail (2.730) X-SA-Exim-Connect-IP: 67.161.222.227 X-SA-Exim-Mail-From: chad@shire.net X-Spam-Checker-Version: SpamAssassin 3.0.3 (2005-04-27) on hobbiton.shire.net X-Spam-Level: X-Spam-Status: No, score=-0.2 required=5.0 tests=AWL,BAYES_50, GREYLIST_ISWHITE autolearn=disabled version=3.0.3 X-SA-Exim-Version: 4.2 (built Mon May 30 00:43:02 MDT 2005) X-SA-Exim-Scanned: Yes (on hobbiton.shire.net) Cc: Kirk Strauser , freebsd-rc@freebsd.org, freebsd-questions@freebsd.org Subject: Re: rcNG script problems 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: Tue, 14 Jun 2005 19:46:38 -0000 On Jun 14, 2005, at 1:39 PM, JM wrote: > Kirk Strauser wrote: > > >> On Tuesday 14 June 2005 12:07, JM wrote: >> >> >>> i've written an rcNG script but i'm having some issues. >>> >>> >> >> Step one: set rc_debug="YES" in /etc/rc.conf to see what's >> actually happening when you attempt to run your script. That >> seems to uncover about 95% of the problems I've had. >> >> > turned on the option rc_debug="YES" and ran 'dmesg -a'... the > script doesn't even show up in the list anywhere. are we not > supposed to be able to write custom rcNG scripts? is there > something i'm overlooking where i need to register httpd_start in > the rc stuff? here's my newbie impression of how rc works: > - rc i run by init > - rc runs rcorder on all script directories. > - rc reads rc.conf and runs all scripts found by rcorder > rcorder recognizes the script i wrote without any errors... yet > when i boot the system, there is no "checkyesno" for httpd_start. > there's nothing that references the script at all... WHY? >.< > > why did FreeBSD have to adopt this standard anyhow? it seems > unnecessarily complicated to write custom scripts now. Where does your script live? You can use rcNG style scripts in /usr/ local/etc but they must end in .sh and are done in lexographic order without the rcorder and stuff (unless you write your own ueber- script to do it) I battled this for a long while before I figured out the /usr/local/ etc does not get full rcNG support Chad From owner-freebsd-rc@FreeBSD.ORG Tue Jun 14 22:12:04 2005 Return-Path: X-Original-To: freebsd-rc@freebsd.org Delivered-To: freebsd-rc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F57616A41C; Tue, 14 Jun 2005 22:12:04 +0000 (GMT) (envelope-from xfb52@dial.pipex.com) Received: from smtp-out5.blueyonder.co.uk (smtp-out5.blueyonder.co.uk [195.188.213.8]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85FF643D48; Tue, 14 Jun 2005 22:12:02 +0000 (GMT) (envelope-from xfb52@dial.pipex.com) Received: from [82.41.37.55] ([82.41.37.55]) by smtp-out5.blueyonder.co.uk with Microsoft SMTPSVC(5.0.2195.6713); Tue, 14 Jun 2005 23:12:42 +0100 Message-ID: <42AF5631.5040700@dial.pipex.com> Date: Tue, 14 Jun 2005 23:12:01 +0100 From: Alex Zbyslaw User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-GB; rv:1.7.8) Gecko/20050530 X-Accept-Language: en, en-us, pl MIME-Version: 1.0 To: "Chad Leigh -- Shire.Net LLC" References: <42AF0EDD.4090100@speakeasy.net> <200506141342.07886.kirk@strauser.com> <42AF328D.8090502@speakeasy.net> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 14 Jun 2005 22:12:42.0074 (UTC) FILETIME=[2EFDB3A0:01C5712E] Cc: freebsd-rc@freebsd.org, freebsd-questions@freebsd.org Subject: Re: rcNG script problems 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: Tue, 14 Jun 2005 22:12:04 -0000 Chad Leigh -- Shire.Net LLC wrote: > > On Jun 14, 2005, at 1:39 PM, JM wrote: > >> Kirk Strauser wrote: >> >> >>> On Tuesday 14 June 2005 12:07, JM wrote: >>> >>> >>>> i've written an rcNG script but i'm having some issues. >>>> >>> >>> Step one: set rc_debug="YES" in /etc/rc.conf to see what's actually >>> happening when you attempt to run your script. That seems to >>> uncover about 95% of the problems I've had. >>> >> turned on the option rc_debug="YES" and ran 'dmesg -a'... the script >> doesn't even show up in the list anywhere. are we not supposed to >> be able to write custom rcNG scripts? is there something i'm >> overlooking where i need to register httpd_start in the rc stuff? >> here's my newbie impression of how rc works: >> - rc i run by init >> - rc runs rcorder on all script directories. >> - rc reads rc.conf and runs all scripts found by rcorder >> rcorder recognizes the script i wrote without any errors... yet when >> i boot the system, there is no "checkyesno" for httpd_start. >> there's nothing that references the script at all... WHY? >.< >> >> why did FreeBSD have to adopt this standard anyhow? it seems >> unnecessarily complicated to write custom scripts now. > > > > Where does your script live? You can use rcNG style scripts in /usr/ > local/etc but they must end in .sh and are done in lexographic order > without the rcorder and stuff (unless you write your own ueber- > script to do it) > > I battled this for a long while before I figured out the /usr/local/ > etc does not get full rcNG support I did the same, wondering why scripts weren't even running etc, until I read what the manual page actually said rather than what I wanted it to say :-) Does anyone know why this is? Will /usr/local/etc et al. be getting proper rcNG support? Otherwise port and locally installed software are effectively second class citizens and don't get to benefit especially from the dependency stuff. Currently I'm stuffing local (not port) startups in /etc/rc.d, which I don't like doing (and mergemaster complains about them being obsolete -- I guess trying to spot stuff left over from 4.X). It would be great to know what the plans are. --Alex From owner-freebsd-rc@FreeBSD.ORG Tue Jun 14 22:12:30 2005 Return-Path: X-Original-To: freebsd-rc@freebsd.org Delivered-To: freebsd-rc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 781DA16A41F for ; Tue, 14 Jun 2005 22:12:30 +0000 (GMT) (envelope-from jmartin37@speakeasy.net) Received: from mail27.sea5.speakeasy.net (mail27.sea5.speakeasy.net [69.17.117.29]) by mx1.FreeBSD.org (Postfix) with ESMTP id 331FC43D4C for ; Tue, 14 Jun 2005 22:12:30 +0000 (GMT) (envelope-from jmartin37@speakeasy.net) Received: (qmail 16430 invoked from network); 14 Jun 2005 22:12:29 -0000 Received: from dsl027-163-157.atl1.dsl.speakeasy.net (HELO [192.168.0.200]) (moonlightcheese@[216.27.163.157]) (envelope-sender ) by mail27.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 14 Jun 2005 22:12:29 -0000 Message-ID: <42AF564C.4040907@speakeasy.net> Date: Tue, 14 Jun 2005 18:12:28 -0400 From: Jarrod Martin User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) X-Accept-Language: en-us, en MIME-Version: 1.0 To: "Chad Leigh -- Shire.Net LLC" References: <42AF0EDD.4090100@speakeasy.net> <200506141342.07886.kirk@strauser.com> <42AF328D.8090502@speakeasy.net> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-rc@freebsd.org, freebsd-questions@freebsd.org Subject: Re: rcNG script problems 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: Tue, 14 Jun 2005 22:12:30 -0000 Chad Leigh -- Shire.Net LLC wrote: > > On Jun 14, 2005, at 1:39 PM, JM wrote: > >> Kirk Strauser wrote: >> >> >>> On Tuesday 14 June 2005 12:07, JM wrote: >>> >>> >>>> i've written an rcNG script but i'm having some issues. >>>> >>>> >>> >>> Step one: set rc_debug="YES" in /etc/rc.conf to see what's actually >>> happening when you attempt to run your script. That seems to >>> uncover about 95% of the problems I've had. >>> >>> >> turned on the option rc_debug="YES" and ran 'dmesg -a'... the script >> doesn't even show up in the list anywhere. are we not supposed to >> be able to write custom rcNG scripts? is there something i'm >> overlooking where i need to register httpd_start in the rc stuff? >> here's my newbie impression of how rc works: >> - rc i run by init >> - rc runs rcorder on all script directories. >> - rc reads rc.conf and runs all scripts found by rcorder >> rcorder recognizes the script i wrote without any errors... yet when >> i boot the system, there is no "checkyesno" for httpd_start. >> there's nothing that references the script at all... WHY? >.< >> >> why did FreeBSD have to adopt this standard anyhow? it seems >> unnecessarily complicated to write custom scripts now. > > > > Where does your script live? You can use rcNG style scripts in /usr/ > local/etc but they must end in .sh and are done in lexographic order > without the rcorder and stuff (unless you write your own ueber- > script to do it) > > I battled this for a long while before I figured out the /usr/local/ > etc does not get full rcNG support > > Chad > _______________________________________________ > freebsd-questions@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-questions > To unsubscribe, send any mail to > "freebsd-questions-unsubscribe@freebsd.org" yea i've figured it out. this really should be better documented though... i'll be sending all the info to the documentation mailing list. here's the proper way to do it. the filename is 'httpd_start.sh' with 555 mode. rc scripts, both rcNG and the old *.sh styles must have the .sh extension to be recognized (source: bsdforums.org). the script was placed in '/usr/local/etc/rc.d'. and here is the code: [code] #!/bin/sh # # PROVIDE: httpd_start # REQUIRE: LOGIN . /etc/rc.subr name="httpd_start" rcvar=`set_rcvar` command="/var/www/bin/apachectl" args="start" start_cmd="${command} ${args}" stop_cmd="/var/www/bin/apachectl stop" httpd_start_enable=${httpd_start_enable-"NO"} httpd_start_flags=${httpd_start_flags-""} load_rc_config $name run_rc_command "$1" [/code] the line 'httpd_start_enable="YES"' was added to rc.conf and this fixed everything. From owner-freebsd-rc@FreeBSD.ORG Tue Jun 14 22:27:23 2005 Return-Path: X-Original-To: freebsd-rc@freebsd.org Delivered-To: freebsd-rc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28D7716A421 for ; Tue, 14 Jun 2005 22:27:23 +0000 (GMT) (envelope-from jmartin37@speakeasy.net) Received: from mail21.sea5.speakeasy.net (mail21.sea5.speakeasy.net [69.17.117.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7634943D53 for ; Tue, 14 Jun 2005 22:27:22 +0000 (GMT) (envelope-from jmartin37@speakeasy.net) Received: (qmail 5937 invoked from network); 14 Jun 2005 22:27:22 -0000 Received: from dsl027-163-157.atl1.dsl.speakeasy.net (HELO [192.168.0.200]) (moonlightcheese@[216.27.163.157]) (envelope-sender ) by mail21.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 14 Jun 2005 22:27:21 -0000 Message-ID: <42AF59C8.7070302@speakeasy.net> Date: Tue, 14 Jun 2005 18:27:20 -0400 From: Jarrod Martin User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Alex Zbyslaw References: <42AF0EDD.4090100@speakeasy.net> <200506141342.07886.kirk@strauser.com> <42AF328D.8090502@speakeasy.net> <42AF5631.5040700@dial.pipex.com> In-Reply-To: <42AF5631.5040700@dial.pipex.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-rc@freebsd.org, freebsd-questions@freebsd.org, "Chad Leigh -- Shire.Net LLC" Subject: Re: rcNG script problems 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: Tue, 14 Jun 2005 22:27:23 -0000 Alex Zbyslaw wrote: > Chad Leigh -- Shire.Net LLC wrote: > >> >> On Jun 14, 2005, at 1:39 PM, JM wrote: >> >>> Kirk Strauser wrote: >>> >>> >>>> On Tuesday 14 June 2005 12:07, JM wrote: >>>> >>>> >>>>> i've written an rcNG script but i'm having some issues. >>>>> >>>> >>>> Step one: set rc_debug="YES" in /etc/rc.conf to see what's >>>> actually happening when you attempt to run your script. That >>>> seems to uncover about 95% of the problems I've had. >>>> >>> turned on the option rc_debug="YES" and ran 'dmesg -a'... the >>> script doesn't even show up in the list anywhere. are we not >>> supposed to be able to write custom rcNG scripts? is there >>> something i'm overlooking where i need to register httpd_start in >>> the rc stuff? here's my newbie impression of how rc works: >>> - rc i run by init >>> - rc runs rcorder on all script directories. >>> - rc reads rc.conf and runs all scripts found by rcorder >>> rcorder recognizes the script i wrote without any errors... yet >>> when i boot the system, there is no "checkyesno" for httpd_start. >>> there's nothing that references the script at all... WHY? >.< >>> >>> why did FreeBSD have to adopt this standard anyhow? it seems >>> unnecessarily complicated to write custom scripts now. >> >> >> >> >> Where does your script live? You can use rcNG style scripts in /usr/ >> local/etc but they must end in .sh and are done in lexographic >> order without the rcorder and stuff (unless you write your own >> ueber- script to do it) >> >> I battled this for a long while before I figured out the /usr/local/ >> etc does not get full rcNG support > > > I did the same, wondering why scripts weren't even running etc, until > I read what the manual page actually said rather than what I wanted it > to say :-) > > Does anyone know why this is? Will /usr/local/etc et al. be getting > proper rcNG support? Otherwise port and locally installed software > are effectively second class citizens and don't get to benefit > especially from the dependency stuff. Currently I'm stuffing local > (not port) startups in /etc/rc.d, which I don't like doing (and > mergemaster complains about them being obsolete -- I guess trying to > spot stuff left over from 4.X). It would be great to know what the > plans are. > > --Alex > > > > > > _______________________________________________ > freebsd-questions@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-questions > To unsubscribe, send any mail to > "freebsd-questions-unsubscribe@freebsd.org" yea that's the whole reason i was attempting to get this done right. i hate doing work that will be deprecated or fondled or otherwise abused in later releases. From owner-freebsd-rc@FreeBSD.ORG Tue Jun 14 22:40:36 2005 Return-Path: X-Original-To: freebsd-rc@freebsd.org Delivered-To: freebsd-rc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CC0716A423; Tue, 14 Jun 2005 22:40:33 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB4CE43D77; Tue, 14 Jun 2005 22:40:29 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id j5EMeMeq003855; Tue, 14 Jun 2005 15:40:22 -0700 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id j5EMeMhE003852; Tue, 14 Jun 2005 15:40:22 -0700 Date: Tue, 14 Jun 2005 15:40:22 -0700 From: Brooks Davis To: Alex Zbyslaw Message-ID: <20050614224022.GA2543@odin.ac.hmc.edu> References: <42AF0EDD.4090100@speakeasy.net> <200506141342.07886.kirk@strauser.com> <42AF328D.8090502@speakeasy.net> <42AF5631.5040700@dial.pipex.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="5vNYLRcllDrimb99" Content-Disposition: inline In-Reply-To: <42AF5631.5040700@dial.pipex.com> User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu Cc: freebsd-rc@freebsd.org, freebsd-questions@freebsd.org, "Chad Leigh -- Shire.Net LLC" Subject: Re: rcNG script problems 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: Tue, 14 Jun 2005 22:40:38 -0000 --5vNYLRcllDrimb99 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jun 14, 2005 at 11:12:01PM +0100, Alex Zbyslaw wrote: > Chad Leigh -- Shire.Net LLC wrote: >=20 > > > >On Jun 14, 2005, at 1:39 PM, JM wrote: > > > >>Kirk Strauser wrote: > >> > >> > >>>On Tuesday 14 June 2005 12:07, JM wrote: > >>> > >>> > >>>>i've written an rcNG script but i'm having some issues. > >>>> > >>> > >>>Step one: set rc_debug=3D"YES" in /etc/rc.conf to see what's actually= =20 > >>>happening when you attempt to run your script. That seems to=20 > >>>uncover about 95% of the problems I've had. > >>> > >>turned on the option rc_debug=3D"YES" and ran 'dmesg -a'... the script= =20 > >>doesn't even show up in the list anywhere. are we not supposed to=20 > >>be able to write custom rcNG scripts? is there something i'm=20 > >>overlooking where i need to register httpd_start in the rc stuff? =20 > >>here's my newbie impression of how rc works: > >>- rc i run by init > >>- rc runs rcorder on all script directories. > >>- rc reads rc.conf and runs all scripts found by rcorder > >>rcorder recognizes the script i wrote without any errors... yet when= =20 > >>i boot the system, there is no "checkyesno" for httpd_start. =20 > >>there's nothing that references the script at all... WHY? >.< > >> > >>why did FreeBSD have to adopt this standard anyhow? it seems =20 > >>unnecessarily complicated to write custom scripts now. > > > > > > > >Where does your script live? You can use rcNG style scripts in /usr/=20 > >local/etc but they must end in .sh and are done in lexographic order = =20 > >without the rcorder and stuff (unless you write your own ueber-=20 > >script to do it) > > > >I battled this for a long while before I figured out the /usr/local/=20 > >etc does not get full rcNG support >=20 > I did the same, wondering why scripts weren't even running etc, until I= =20 > read what the manual page actually said rather than what I wanted it to= =20 > say :-) >=20 > Does anyone know why this is? Will /usr/local/etc et al. be getting=20 > proper rcNG support? Otherwise port and locally installed software are= =20 > effectively second class citizens and don't get to benefit especially=20 > from the dependency stuff. Currently I'm stuffing local (not port)=20 > startups in /etc/rc.d, which I don't like doing (and mergemaster=20 > complains about them being obsolete -- I guess trying to spot stuff left= =20 > over from 4.X). It would be great to know what the plans are. There are two reasons. First, we have nearly thirteen-THOUSAND ports so any change needs to be gradual. Second, /usr/local is not generally available when rcorder is run so /etc/rc becomes more complicated to allow scripts to be reordered after mountcritremote is run. That said, we're planning to provide partial rcorder support in 6.0 and hopefully full support in 7.0. Discussions of this are taking place on the freebsd-rc list. -- Brooks --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --5vNYLRcllDrimb99 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFCr1zVXY6L6fI4GtQRApn0AJ0UpuIssttXtiL8CfEM0sSml5u+XACeLKSZ Dvcf2vNnn0XMUqmeJ+2l4ME= =2WAH -----END PGP SIGNATURE----- --5vNYLRcllDrimb99-- From owner-freebsd-rc@FreeBSD.ORG Wed Jun 15 10:28:56 2005 Return-Path: X-Original-To: freebsd-rc@freebsd.org Delivered-To: freebsd-rc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A13B916A41C; Wed, 15 Jun 2005 10:28:56 +0000 (GMT) (envelope-from xfb52@dial.pipex.com) Received: from smtp-out5.blueyonder.co.uk (smtp-out5.blueyonder.co.uk [195.188.213.8]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E3ED43D4C; Wed, 15 Jun 2005 10:28:55 +0000 (GMT) (envelope-from xfb52@dial.pipex.com) Received: from [82.41.37.55] ([82.41.37.55]) by smtp-out5.blueyonder.co.uk with Microsoft SMTPSVC(5.0.2195.6713); Wed, 15 Jun 2005 11:29:34 +0100 Message-ID: <42B002E5.9000708@dial.pipex.com> Date: Wed, 15 Jun 2005 11:28:53 +0100 From: Alex Zbyslaw User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-GB; rv:1.7.8) Gecko/20050530 X-Accept-Language: en, en-us, pl MIME-Version: 1.0 To: Brooks Davis References: <42AF0EDD.4090100@speakeasy.net> <200506141342.07886.kirk@strauser.com> <42AF328D.8090502@speakeasy.net> <42AF5631.5040700@dial.pipex.com> <20050614224022.GA2543@odin.ac.hmc.edu> In-Reply-To: <20050614224022.GA2543@odin.ac.hmc.edu> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 15 Jun 2005 10:29:34.0849 (UTC) FILETIME=[1FDBC710:01C57195] Cc: freebsd-rc@freebsd.org, freebsd-questions@freebsd.org Subject: Re: rcNG script problems 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: Wed, 15 Jun 2005 10:28:56 -0000 Brooks Davis wrote: [rcorder not being run on /usr/local/etc/rc.d etc] >There are two reasons. First, we have nearly thirteen-THOUSAND ports >so any change needs to be gradual. Second, /usr/local is not >generally available when rcorder is run so /etc/rc becomes >more complicated to allow scripts to be reordered after mountcritremote >is run. That said, we're planning to provide partial rcorder support in >6.0 and hopefully full support in 7.0. Discussions of this are taking >place on the freebsd-rc list. > > > Good to know -- and time to sub to a new mailing list :-) I certainly wasn't expecting all the existing ports to be converted! I expected that the existing 'scripts ending in .sh' mechanism would continue, either putting them in a different directory or putting some logic into /etc/rc to avoid them. I hadn't considered the not mounted problem :-( Anyway, thanks for the info. For now I'll keep with putting my own scripts into /etc/rc.d and keeping copies elsewhere for easy rebuilding. --Alex From owner-freebsd-rc@FreeBSD.ORG Wed Jun 15 16:27:55 2005 Return-Path: X-Original-To: freebsd-rc@FreeBSD.org Delivered-To: freebsd-rc@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E580216A41C; Wed, 15 Jun 2005 16:27:55 +0000 (GMT) (envelope-from rionda@gufi.org) Received: from vsmtp1.tin.it (vsmtp1.tin.it [212.216.176.141]) by mx1.FreeBSD.org (Postfix) with ESMTP id A650743D49; Wed, 15 Jun 2005 16:27:55 +0000 (GMT) (envelope-from rionda@gufi.org) Received: from kaiser.sig11.org (82.48.161.190) by vsmtp1.tin.it (7.0.027) id 42B04AD2000076AD; Wed, 15 Jun 2005 18:27:45 +0200 Received: by kaiser.sig11.org (Postfix, from userid 1000) id C9D66610F; Wed, 15 Jun 2005 18:27:44 +0200 (CEST) Date: Wed, 15 Jun 2005 18:27:44 +0200 From: Matteo Riondato To: bug-followup@FreeBSD.org, edwin@mavetju.org, mmolteni@cisco.com, freebsd-rc@freebsd.org Message-ID: <20050615162744.GP1053@kaiser.sig11.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.1i Cc: Subject: Re: kern/63954: devfs loses permissions 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: Wed, 15 Jun 2005 16:27:56 -0000 Patch for this against /etc/rc.d/devfs follows and can be found at http://www.riondabsd.net/diff/devfs.diff. Please note that this patch includes fix for PR bin/65693 (wildcarded device names in devfs.conf ). I hope someone will pick this up and commit the patch. --- devfs.old Wed Jun 8 22:50:32 2005 +++ devfs Wed Jun 15 14:50:37 2005 @@ -37,25 +37,44 @@ read_devfs_conf } + +do_action() +{ + case "$1" in + l*) if [ -c $2 -a ! -e $3 ]; then + ln -fs $2 $3 + fi + ;; + o*) if [ -c $2 ]; then + chown $3 $2 + fi + if echo $3 | grep -q : ; then + uid=${3%%:*} + gid=${3##*:} + devfs rule add path $2 user $uid group $gid + devfs rule apply path $2 user $uid group $gid + else + devfs rule add path $2 user $3 + devfs rule apply path $2 user $3 + fi + ;; + p*) if [ -c $2 ]; then + chmod $3 $2 + fi + devfs rule add path $2 mode $3 + devfs rule apply path $2 + ;; + esac +} + read_devfs_conf() { if [ -r /etc/devfs.conf ]; then cd /dev while read action device parameter; do - case "${action}" in - l*) if [ -c ${device} -a ! -e ${parameter} ]; then - ln -fs ${device} ${parameter} - fi - ;; - o*) if [ -c ${device} ]; then - chown ${parameter} ${device} - fi - ;; - p*) if [ -c ${device} ]; then - chmod ${parameter} ${device} - fi - ;; - esac + for dev_name in ${device}; do + do_action ${action} ${dev_name} ${parameter} + done done < /etc/devfs.conf fi } Best Regards -- Rionda aka Matteo Riondato G.U.F.I. Staff Member (http://www.gufi.org) FreeSBIE Developer (http://www.freesbie.org) From owner-freebsd-rc@FreeBSD.ORG Wed Jun 15 16:30:06 2005 Return-Path: X-Original-To: freebsd-rc@FreeBSD.org Delivered-To: freebsd-rc@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F2C8F16A41C; Wed, 15 Jun 2005 16:30:05 +0000 (GMT) (envelope-from jr@opal.com) Received: from smtp.vzavenue.net (smtp.vzavenue.net [66.171.59.140]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F93843D53; Wed, 15 Jun 2005 16:30:05 +0000 (GMT) (envelope-from jr@opal.com) Received: from linwhf.opal.com (112.79.171.66.subscriber.vzavenue.net [66.171.79.112]) by smtp.vzavenue.net (MOS 3.4.8-GR) with ESMTP id CJX07260; Wed, 15 Jun 2005 12:29:56 -0400 (EDT) Received: from ASSP-nospam (localhost [127.0.0.1]) by linwhf.opal.com (8.13.3/8.13.3) with ESMTP id j5FGTtSc029831; Wed, 15 Jun 2005 12:29:55 -0400 (EDT) (envelope-from jr@opal.com) Received: from 127.0.0.1 ([127.0.0.1] helo=linwhf.opal.com) by ASSP-nospam ; 15 Jun 05 16:29:55 -0000 Received: (from jr@localhost) by linwhf.opal.com (8.13.3/8.13.3/Submit) id j5FGTmiV029830; Wed, 15 Jun 2005 12:29:48 -0400 (EDT) (envelope-from jr) Date: Wed, 15 Jun 2005 12:29:48 -0400 From: "J.R. Oldroyd" To: Brooks Davis Message-ID: <20050615162948.GG16676@linwhf.opal.com> References: <42A89CD7.1080404@FreeBSD.org> <20050609201017.GA10248@odin.ac.hmc.edu> <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg> <20050613005533.GA28966@odin.ac.hmc.edu> <42AD19C9.2040403@FreeBSD.org> <20050613155211.GB19722@odin.ac.hmc.edu> <20050614134732.GB16676@linwhf.opal.com> <20050614172740.GC20371@odin.ac.hmc.edu> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="gr/z0/N6AeWAPJVB" Content-Disposition: inline In-Reply-To: <20050614172740.GC20371@odin.ac.hmc.edu> User-Agent: Mutt/1.4.2.1i X-Junkmail-Status: score=0/50, host=smtp.vzavenue.net Cc: Doug Barton , freebsd-rc@FreeBSD.org Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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: Wed, 15 Jun 2005 16:30:06 -0000 --gr/z0/N6AeWAPJVB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Jun 14, 10:27, Brooks Davis wrote: > On Tue, Jun 14, 2005 at 09:47:32AM -0400, J.R. Oldroyd wrote: >=20 > > A. NOW: > > /etc/rc.d rcordered with "foo" run in subshell and > > "foo.sh" sourced > > local dirs "foo.sh" run in subshell from localpkg > > in alphabetical order > >=20 > > B. SOON: > > /etc/rc.d rcordered with "foo" run in subshell and > > "foo.sh" sourced > > local dirs "[0-9]foo.sh" scripts are run in a subshell > > first, then "[^0-9]foo.sh" and executable > > "[^0-9]foo" scripts run rcordered and run in > > subshells; "foo.xyz" (e.g., ".sample") ignored? > > ACTION required of port maintainers: NONE >=20 > One concern I have here is what does first mean? It seems like we may > need to run as early as immediatly after mountcritremote which does > change the order a bit and would require a new rc script, something like > localpkg-early. >=20 I meant first in localpkg. Or in a localpkg-early script, but I don't see the need for an extra script. > I'm not quite sure about the exclusions for rcorder. The *.* exclusion > seems like an easy way to avoid *.sh, *.sample, *.orig, *.bak, etc. I'm > not sure what the point of the [^0-9] is though, it would seem that the > logical migration path would be for users to add appropriate dependency > tags to their scripts and set a ports Makefile variable to cause the .sh > to be stripped when installing on appropriate versions of FreeBSD. > Removing the ### bits could be done after the flagday. >=20 We need to pin this down. The goal is to exclude junk files. If "*.*" is the simplest pattern that does this, great; if not, we need a more explicit list such as "*.bak *.orig *.sample" etc. I would prefer to see (in the final "C." version) that the ONLY things allowed in the local rc.d dirs are "foo.sh" files which are sourced and "foo" files which are run in a subshell, so as to be consistent with /etc/rc.d. I.e., in the intermediate "B." version, anything that is identifiably not this needs to generate a warning. Are we in agreement that the intermediate "B." versions should not break anything and should not require any changes by port maintainers? > I'd be strongly tempted to require the documented rcorder pattern be > matched by the script in addition to the other exclustions. We should > have egrep at this point so that should be easy. >=20 Working, still, on the basis of the intermediate version not requiring any changes from port maintainers in order to preserve existing functionality, but accepting that we do want to allow maintainers to access the new functionality if they indicate it, here's what I'm now thinking: we only want to require the use of keywords or tag checking if a port maintainer wants to have a "foo.sh" file sourced. If we're not changing /etc/rc and adding the transition functionality in localpkg, the transition localpkg will have to: process local scripts [0-9]*.sh (in order to preserve current behavior) - warn and don't run non-executable files - warn and don't run files named "*.sample", "*.bak", "*.orig" etc - warn (suggesting name change) but do run (in subshell), files named "[0-9]*.sh" rcorder and process all the remianing local scripts (rcorder will include non-tagged files at the end of its sorted list, so these are included here too): - warn and don't run non-executable files - warn and don't run files named "*.sample", "*.bak", "*.orig" etc - warn (suggesting name change) but do run (in subshell) files named "[^0-9]*.sh" without new RC_SUBR keyword - quietly run (as sourced file) files named "[^0-9]*.sh" which have new RC_SUBR keyword (but note that we're in localpkg here, not /etc/rc so sourcing not quite the same, unless we do move this functionality into /etc/rc now) - quietly run (in subshell) all other files with rcorder tags - warn and don't run any remaining files I don't think we need to require checking for a keyword in files named "foo". If we've identified a proper exclusion list and checked for rcorder tags on "foo" files, we're not going to be running any "foo" files which are junk. I dislike the idea of obliging port maintainers to add temporary keywords which have to be removed later; the above only requires this for functionality not currently available. On the flag day, the final version would be to remove the localpkg script and go to the modified /etc/rc which I posted last week. Since by then, there should no longer be any junk files, and foo/foo.sh semantics will be the same as /etc/rc.d, so that version of /etc/rc should work as proposed. > I'd like to whine about any files that aren't run, probalby in localpkg. > It's fairly easy to do and would provide a push to get rid of the > various .sample bits. >=20 Agreed - see above. > > C. AT FUTURE FLAGDAY: > > /etc/rc.d+local rcordered with "foo" run in subshell and > > "foo.sh" sourced; "foo.xyz" files now treated > > as "foo" > > ACTION required of port maintainers: > > - add rcorder tags to all scripts > > - rename "foo.sh" to "foo" unless sourced > > behavior is desired >=20 > I think we should be able to automate this via USE_RC_SUBR and/or > RC_ORDER. >=20 I'm worried that using these keywords as the control to install files/foo.sh.in as rc.d/foo makes it hard to distunguish between ports which want to install both foo.sh and foo startup scripts (the former to be sourced, the latter to be run in a subshell)? It may be easier just to require port maintainers to rename files/foo.sh.in to files/foo.in which they can do at any point the transition period. > > My thought is that to oblige port maintainers to make changes in > > the short term will be hard. Give them some time (between points > > B. and C. and acceptance of the change will be a lot easier). > >=20 > > So let's provide intermediate rc, rc.subr and localpkg scripts that > > may be larger and more complex, but which don't place an immediate > > burden on 13,000 port maintainers. Then provide a final set of > > scripts which do. The intermediate scripts can provide warning > > messages that alert that a change may be needed. >=20 > I agree. I'd like to do the spadework to make the major benefits > available for 6.0 and then take the time between 6.0 and 7.0 to work > towards the flag day. There's no reason not to make the full transition > in ports before 7.0 so all the flagday does is make old junk stop > working, as long as we do the work to warn about old style bits from > the beginning. >=20 I'm surprised you're saying we need to wait as long as 7.0 for the flag day. Isn't that over 18 months away? Wouldn't something like a three or six month transition period be enough? After a HEADSUP and warnings, I'd imagine that would be long enough for port maintainers to make the needed changes. -jr --gr/z0/N6AeWAPJVB Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (FreeBSD) iQDVAwUBQrBXfEkkqUax7f6FAQJ+wgX/e1WdfoHb1qXxTAGRENmxITXsZT9xSTvj 12+bejjPwdic9NDXpgScSmrC+O/OCsI93O/ghHRl9d0koTcG9cGKRFkDEBefE3ZO ZOF1WlqhcIqhzKq2ejDA/jVH/D0qX0wwDkmhD6Vw0ZUW95p0m3fzSB5GRx/exBY+ m1hJWc/A6alXe1GzoWyWDNb1pZN96hsqRN4yuOi3jOLnvCenZrwL2BYhxlk8fJB2 MjISlpppMqy4WcnqjmdjqmEVWbQyyRot =+2Sy -----END PGP SIGNATURE----- --gr/z0/N6AeWAPJVB-- From owner-freebsd-rc@FreeBSD.ORG Wed Jun 15 16:30:18 2005 Return-Path: X-Original-To: freebsd-rc@hub.freebsd.org Delivered-To: freebsd-rc@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E77F16A41C for ; Wed, 15 Jun 2005 16:30:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73D5543D1F for ; Wed, 15 Jun 2005 16:30:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j5FGUIXB071755 for ; Wed, 15 Jun 2005 16:30:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5FGUI4L071754; Wed, 15 Jun 2005 16:30:18 GMT (envelope-from gnats) Date: Wed, 15 Jun 2005 16:30:18 GMT Message-Id: <200506151630.j5FGUI4L071754@freefall.freebsd.org> To: freebsd-rc@FreeBSD.org From: Matteo Riondato Cc: Subject: Re: kern/63954: devfs loses permissions X-BeenThere: freebsd-rc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Matteo Riondato 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: Wed, 15 Jun 2005 16:30:18 -0000 The following reply was made to PR kern/63954; it has been noted by GNATS. From: Matteo Riondato To: bug-followup@FreeBSD.org, edwin@mavetju.org, mmolteni@cisco.com, freebsd-rc@freebsd.org Cc: Subject: Re: kern/63954: devfs loses permissions Date: Wed, 15 Jun 2005 18:27:44 +0200 Patch for this against /etc/rc.d/devfs follows and can be found at http://www.riondabsd.net/diff/devfs.diff. Please note that this patch includes fix for PR bin/65693 (wildcarded device names in devfs.conf ). I hope someone will pick this up and commit the patch. --- devfs.old Wed Jun 8 22:50:32 2005 +++ devfs Wed Jun 15 14:50:37 2005 @@ -37,25 +37,44 @@ read_devfs_conf } + +do_action() +{ + case "$1" in + l*) if [ -c $2 -a ! -e $3 ]; then + ln -fs $2 $3 + fi + ;; + o*) if [ -c $2 ]; then + chown $3 $2 + fi + if echo $3 | grep -q : ; then + uid=${3%%:*} + gid=${3##*:} + devfs rule add path $2 user $uid group $gid + devfs rule apply path $2 user $uid group $gid + else + devfs rule add path $2 user $3 + devfs rule apply path $2 user $3 + fi + ;; + p*) if [ -c $2 ]; then + chmod $3 $2 + fi + devfs rule add path $2 mode $3 + devfs rule apply path $2 + ;; + esac +} + read_devfs_conf() { if [ -r /etc/devfs.conf ]; then cd /dev while read action device parameter; do - case "${action}" in - l*) if [ -c ${device} -a ! -e ${parameter} ]; then - ln -fs ${device} ${parameter} - fi - ;; - o*) if [ -c ${device} ]; then - chown ${parameter} ${device} - fi - ;; - p*) if [ -c ${device} ]; then - chmod ${parameter} ${device} - fi - ;; - esac + for dev_name in ${device}; do + do_action ${action} ${dev_name} ${parameter} + done done < /etc/devfs.conf fi } Best Regards -- Rionda aka Matteo Riondato G.U.F.I. Staff Member (http://www.gufi.org) FreeSBIE Developer (http://www.freesbie.org) From owner-freebsd-rc@FreeBSD.ORG Wed Jun 15 16:51:14 2005 Return-Path: X-Original-To: freebsd-rc@FreeBSD.org Delivered-To: freebsd-rc@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D21A16A41C for ; Wed, 15 Jun 2005 16:51:14 +0000 (GMT) (envelope-from jmartin37@speakeasy.net) Received: from mail26.sea5.speakeasy.net (mail26.sea5.speakeasy.net [69.17.117.28]) by mx1.FreeBSD.org (Postfix) with ESMTP id C453443D4C for ; Wed, 15 Jun 2005 16:51:13 +0000 (GMT) (envelope-from jmartin37@speakeasy.net) Received: (qmail 16711 invoked from network); 15 Jun 2005 16:51:13 -0000 Received: from adsl-211-141-154.asm.bellsouth.net (HELO [192.168.2.101]) (moonlightcheese@[68.211.141.154]) (envelope-sender ) by mail26.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 15 Jun 2005 16:51:12 -0000 Message-ID: <42B05C7C.6060301@speakeasy.net> Date: Wed, 15 Jun 2005 12:51:08 -0400 From: JM User-Agent: Mozilla Thunderbird 1.0.2-1.3.3 (X11/20050513) X-Accept-Language: en-us, en MIME-Version: 1.0 To: "J.R. Oldroyd" References: <42A89CD7.1080404@FreeBSD.org> <20050609201017.GA10248@odin.ac.hmc.edu> <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg> <20050613005533.GA28966@odin.ac.hmc.edu> <42AD19C9.2040403@FreeBSD.org> <20050613155211.GB19722@odin.ac.hmc.edu> <20050614134732.GB16676@linwhf.opal.com> <20050614172740.GC20371@odin.ac.hmc.edu> <20050615162948.GG16676@linwhf.opal.com> In-Reply-To: <20050615162948.GG16676@linwhf.opal.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Doug Barton , freebsd-rc@FreeBSD.org Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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: Wed, 15 Jun 2005 16:51:14 -0000 J.R. Oldroyd wrote: >On Jun 14, 10:27, Brooks Davis wrote: > > >>On Tue, Jun 14, 2005 at 09:47:32AM -0400, J.R. Oldroyd wrote: >> >> >> >>>A. NOW: >>> /etc/rc.d rcordered with "foo" run in subshell and >>> "foo.sh" sourced >>> local dirs "foo.sh" run in subshell from localpkg >>> in alphabetical order >>> >>>B. SOON: >>> /etc/rc.d rcordered with "foo" run in subshell and >>> "foo.sh" sourced >>> local dirs "[0-9]foo.sh" scripts are run in a subshell >>> first, then "[^0-9]foo.sh" and executable >>> "[^0-9]foo" scripts run rcordered and run in >>> subshells; "foo.xyz" (e.g., ".sample") ignored? >>> ACTION required of port maintainers: NONE >>> >>> >>One concern I have here is what does first mean? It seems like we may >>need to run as early as immediatly after mountcritremote which does >>change the order a bit and would require a new rc script, something like >>localpkg-early. >> >> >> >I meant first in localpkg. Or in a localpkg-early script, but I don't >see the need for an extra script. > > > > >>I'm not quite sure about the exclusions for rcorder. The *.* exclusion >>seems like an easy way to avoid *.sh, *.sample, *.orig, *.bak, etc. I'm >>not sure what the point of the [^0-9] is though, it would seem that the >>logical migration path would be for users to add appropriate dependency >>tags to their scripts and set a ports Makefile variable to cause the .sh >>to be stripped when installing on appropriate versions of FreeBSD. >>Removing the ### bits could be done after the flagday. >> >> >> >We need to pin this down. The goal is to exclude junk files. >If "*.*" is the simplest pattern that does this, great; if not, we >need a more explicit list such as "*.bak *.orig *.sample" etc. > >I would prefer to see (in the final "C." version) that the ONLY >things allowed in the local rc.d dirs are "foo.sh" files which are >sourced and "foo" files which are run in a subshell, so as to be >consistent with /etc/rc.d. I.e., in the intermediate "B." version, >anything that is identifiably not this needs to generate a warning. > >Are we in agreement that the intermediate "B." versions should not >break anything and should not require any changes by port maintainers? > > > > >>I'd be strongly tempted to require the documented rcorder pattern be >>matched by the script in addition to the other exclustions. We should >>have egrep at this point so that should be easy. >> >> >> >Working, still, on the basis of the intermediate version not requiring >any changes from port maintainers in order to preserve existing >functionality, but accepting that we do want to allow maintainers >to access the new functionality if they indicate it, here's what >I'm now thinking: we only want to require the use of keywords >or tag checking if a port maintainer wants to have a "foo.sh" file >sourced. > >If we're not changing /etc/rc and adding the transition functionality >in localpkg, the transition localpkg will have to: > > process local scripts [0-9]*.sh (in order to preserve > current behavior) > > - warn and don't run non-executable files > > - warn and don't run files named "*.sample", > "*.bak", "*.orig" etc > > - warn (suggesting name change) but do run (in > subshell), files named "[0-9]*.sh" > > rcorder and process all the remianing local scripts > (rcorder will include non-tagged files at the > end of its sorted list, so these are included here > too): > > - warn and don't run non-executable files > > - warn and don't run files named "*.sample", > "*.bak", "*.orig" etc > > - warn (suggesting name change) but do run (in > subshell) files named "[^0-9]*.sh" without > new RC_SUBR keyword > > - quietly run (as sourced file) files named > "[^0-9]*.sh" which have new RC_SUBR keyword > (but note that we're in localpkg here, not > /etc/rc so sourcing not quite the same, unless > we do move this functionality into /etc/rc now) > > - quietly run (in subshell) all other files with > rcorder tags > > - warn and don't run any remaining files > > shouldn't rcorder be run through /usr/local/etc/rc.d before it searches for and executes *.sh files? perhaps mimic the current /etc/rc.d mechanism where a piece of rcorder includes "local package initialization" (which could be potentially renamed to "starting legacy .sh scripts" that runs as a part of rcorder... basically nesting a mirror image of rcorder within the main rcorder that runs through /etc/rc.d... this is the only suggestion i have with my limited knowledge of rc scripts. if it sounds dumb just disregard >.> but i would think that you would want to put more emphasis on change, and executing rcorder scripts first would help to ensure this. >I don't think we need to require checking for a keyword in files >named "foo". If we've identified a proper exclusion list and checked >for rcorder tags on "foo" files, we're not going to be running any >"foo" files which are junk. I dislike the idea of obliging port >maintainers to add temporary keywords which have to be removed >later; the above only requires this for functionality not currently >available. > >On the flag day, the final version would be to remove the localpkg >script and go to the modified /etc/rc which I posted last week. >Since by then, there should no longer be any junk files, and >foo/foo.sh semantics will be the same as /etc/rc.d, so that version >of /etc/rc should work as proposed. > > > > >>I'd like to whine about any files that aren't run, probalby in localpkg. >>It's fairly easy to do and would provide a push to get rid of the >>various .sample bits. >> >> >> >Agreed - see above. > > > > >>>C. AT FUTURE FLAGDAY: >>> /etc/rc.d+local rcordered with "foo" run in subshell and >>> "foo.sh" sourced; "foo.xyz" files now treated >>> as "foo" >>> ACTION required of port maintainers: >>> - add rcorder tags to all scripts >>> - rename "foo.sh" to "foo" unless sourced >>> behavior is desired >>> >>> >>I think we should be able to automate this via USE_RC_SUBR and/or >>RC_ORDER. >> >> >> > >I'm worried that using these keywords as the control to install >files/foo.sh.in as rc.d/foo makes it hard to distunguish between >ports which want to install both foo.sh and foo startup scripts >(the former to be sourced, the latter to be run in a subshell)? It >may be easier just to require port maintainers to rename files/foo.sh.in >to files/foo.in which they can do at any point the transition period. > > > > >>>My thought is that to oblige port maintainers to make changes in >>>the short term will be hard. Give them some time (between points >>>B. and C. and acceptance of the change will be a lot easier). >>> >>>So let's provide intermediate rc, rc.subr and localpkg scripts that >>>may be larger and more complex, but which don't place an immediate >>>burden on 13,000 port maintainers. Then provide a final set of >>>scripts which do. The intermediate scripts can provide warning >>>messages that alert that a change may be needed. >>> >>> >>I agree. I'd like to do the spadework to make the major benefits >>available for 6.0 and then take the time between 6.0 and 7.0 to work >>towards the flag day. There's no reason not to make the full transition >>in ports before 7.0 so all the flagday does is make old junk stop >>working, as long as we do the work to warn about old style bits from >>the beginning. >> >> >> >I'm surprised you're saying we need to wait as long as 7.0 for the >flag day. Isn't that over 18 months away? Wouldn't something like >a three or six month transition period be enough? After a HEADSUP and >warnings, I'd imagine that would be long enough for port maintainers >to make the needed changes. > > -jr > > i think 7.0 is a more reasonable release date to expect the change. 6.0 is definitely too close for all of the maintainers to make the necessary changes. From owner-freebsd-rc@FreeBSD.ORG Wed Jun 15 17:04:18 2005 Return-Path: X-Original-To: freebsd-rc@FreeBSD.org Delivered-To: freebsd-rc@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BAE1C16A41F for ; Wed, 15 Jun 2005 17:04:18 +0000 (GMT) (envelope-from jmartin37@speakeasy.net) Received: from mail21.sea5.speakeasy.net (mail21.sea5.speakeasy.net [69.17.117.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92DCA43D48 for ; Wed, 15 Jun 2005 17:04:18 +0000 (GMT) (envelope-from jmartin37@speakeasy.net) Received: (qmail 4225 invoked from network); 15 Jun 2005 17:04:18 -0000 Received: from adsl-211-141-154.asm.bellsouth.net (HELO [192.168.2.101]) (moonlightcheese@[68.211.141.154]) (envelope-sender ) by mail21.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 15 Jun 2005 17:04:17 -0000 Message-ID: <42B05F8D.5020109@speakeasy.net> Date: Wed, 15 Jun 2005 13:04:13 -0400 From: JM User-Agent: Mozilla Thunderbird 1.0.2-1.3.3 (X11/20050513) X-Accept-Language: en-us, en MIME-Version: 1.0 To: JM References: <42A89CD7.1080404@FreeBSD.org> <20050609201017.GA10248@odin.ac.hmc.edu> <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg> <20050613005533.GA28966@odin.ac.hmc.edu> <42AD19C9.2040403@FreeBSD.org> <20050613155211.GB19722@odin.ac.hmc.edu> <20050614134732.GB16676@linwhf.opal.com> <20050614172740.GC20371@odin.ac.hmc.edu> <20050615162948.GG16676@linwhf.opal.com> <42B05C7C.6060301@speakeasy.net> In-Reply-To: <42B05C7C.6060301@speakeasy.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Doug Barton , freebsd-rc@FreeBSD.org, "J.R. Oldroyd" Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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: Wed, 15 Jun 2005 17:04:18 -0000 > shouldn't rcorder be run through /usr/local/etc/rc.d before it > searches for and executes *.sh files? perhaps mimic the current > /etc/rc.d mechanism where a piece of rcorder includes "local package > initialization" (which could be potentially renamed to "starting > legacy .sh scripts" that runs as a part of rcorder... basically > nesting a mirror image of rcorder within the main rcorder that runs > through /etc/rc.d... this is the only suggestion i have with my > limited knowledge of rc scripts. if it sounds dumb just disregard >.> sorry. by /usr/local/etc/rc.d i mean "local dirs". sorry for the vaguery.. From owner-freebsd-rc@FreeBSD.ORG Wed Jun 15 17:30:22 2005 Return-Path: X-Original-To: freebsd-rc@FreeBSD.org Delivered-To: freebsd-rc@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 69AC916A41C; Wed, 15 Jun 2005 17:30:22 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15A1A43D4C; Wed, 15 Jun 2005 17:30:21 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id j5FHULre028983; Wed, 15 Jun 2005 10:30:21 -0700 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id j5FHULuw028982; Wed, 15 Jun 2005 10:30:21 -0700 Date: Wed, 15 Jun 2005 10:30:21 -0700 From: Brooks Davis To: "J.R. Oldroyd" Message-ID: <20050615173021.GB15807@odin.ac.hmc.edu> References: <20050609201017.GA10248@odin.ac.hmc.edu> <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg> <20050613005533.GA28966@odin.ac.hmc.edu> <42AD19C9.2040403@FreeBSD.org> <20050613155211.GB19722@odin.ac.hmc.edu> <20050614134732.GB16676@linwhf.opal.com> <20050614172740.GC20371@odin.ac.hmc.edu> <20050615162948.GG16676@linwhf.opal.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="NDin8bjvE/0mNLFQ" Content-Disposition: inline In-Reply-To: <20050615162948.GG16676@linwhf.opal.com> User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu Cc: Doug Barton , freebsd-rc@FreeBSD.org Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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: Wed, 15 Jun 2005 17:30:22 -0000 --NDin8bjvE/0mNLFQ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jun 15, 2005 at 12:29:48PM -0400, J.R. Oldroyd wrote: > On Jun 14, 10:27, Brooks Davis wrote: > > On Tue, Jun 14, 2005 at 09:47:32AM -0400, J.R. Oldroyd wrote: > >=20 > > > A. NOW: > > > /etc/rc.d rcordered with "foo" run in subshell and > > > "foo.sh" sourced > > > local dirs "foo.sh" run in subshell from localpkg > > > in alphabetical order > > >=20 > > > B. SOON: > > > /etc/rc.d rcordered with "foo" run in subshell and > > > "foo.sh" sourced > > > local dirs "[0-9]foo.sh" scripts are run in a subshell > > > first, then "[^0-9]foo.sh" and executable > > > "[^0-9]foo" scripts run rcordered and run in > > > subshells; "foo.xyz" (e.g., ".sample") ignored? > > > ACTION required of port maintainers: NONE > >=20 > > One concern I have here is what does first mean? It seems like we may > > need to run as early as immediatly after mountcritremote which does > > change the order a bit and would require a new rc script, something like > > localpkg-early. > >=20 > I meant first in localpkg. Or in a localpkg-early script, but I don't > see the need for an extra script. The reason I think we may need an early script is that we're going to be moving some scripts well before localpkg. > > I'm not quite sure about the exclusions for rcorder. The *.* exclusion > > seems like an easy way to avoid *.sh, *.sample, *.orig, *.bak, etc. I'm > > not sure what the point of the [^0-9] is though, it would seem that the > > logical migration path would be for users to add appropriate dependency > > tags to their scripts and set a ports Makefile variable to cause the .sh > > to be stripped when installing on appropriate versions of FreeBSD. > > Removing the ### bits could be done after the flagday. > >=20 > We need to pin this down. The goal is to exclude junk files. > If "*.*" is the simplest pattern that does this, great; if not, we > need a more explicit list such as "*.bak *.orig *.sample" etc. I think *.* is fine. I'd prefer to complain about them from the beginning so we catch any exceptions (possibly suppressing warnings for obvious examples like *.bak, *.orig, *.sample). > I would prefer to see (in the final "C." version) that the ONLY > things allowed in the local rc.d dirs are "foo.sh" files which are > sourced and "foo" files which are run in a subshell, so as to be > consistent with /etc/rc.d. I.e., in the intermediate "B." version, > anything that is identifiably not this needs to generate a warning. I agree. > Are we in agreement that the intermediate "B." versions should not > break anything and should not require any changes by port maintainers? I think this is a good idea and maximizes our changes of successful integration. > > I'd be strongly tempted to require the documented rcorder pattern be > > matched by the script in addition to the other exclustions. We should > > have egrep at this point so that should be easy. > >=20 > Working, still, on the basis of the intermediate version not requiring > any changes from port maintainers in order to preserve existing > functionality, but accepting that we do want to allow maintainers > to access the new functionality if they indicate it, here's what > I'm now thinking: we only want to require the use of keywords > or tag checking if a port maintainer wants to have a "foo.sh" file > sourced. >=20 > If we're not changing /etc/rc and adding the transition functionality > in localpkg, the transition localpkg will have to: >=20 > process local scripts [0-9]*.sh (in order to preserve > current behavior) >=20 > - warn and don't run non-executable files >=20 > - warn and don't run files named "*.sample", > "*.bak", "*.orig" etc >=20 > - warn (suggesting name change) but do run (in > subshell), files named "[0-9]*.sh" >=20 > rcorder and process all the remianing local scripts > (rcorder will include non-tagged files at the > end of its sorted list, so these are included here > too): >=20 > - warn and don't run non-executable files >=20 > - warn and don't run files named "*.sample", > "*.bak", "*.orig" etc >=20 > - warn (suggesting name change) but do run (in > subshell) files named "[^0-9]*.sh" without > new RC_SUBR keyword >=20 > - quietly run (as sourced file) files named > "[^0-9]*.sh" which have new RC_SUBR keyword > (but note that we're in localpkg here, not > /etc/rc so sourcing not quite the same, unless > we do move this functionality into /etc/rc now) I'd rather not support sourcing at all until full transition. I'd rather force porters to install files in /etc/rc.d for now if they want sourcing. > - quietly run (in subshell) all other files with > rcorder tags >=20 > - warn and don't run any remaining files >=20 > I don't think we need to require checking for a keyword in files > named "foo". If we've identified a proper exclusion list and checked > for rcorder tags on "foo" files, we're not going to be running any > "foo" files which are junk. I dislike the idea of obliging port > maintainers to add temporary keywords which have to be removed > later; the above only requires this for functionality not currently > available. I'm not suggesting keywords, I'm suggesting checking for: ^# (REQUIRE|PROVIDE|BEFORE|KEYWORD): This seems like a reasonable thing to do because none of these scripts will run now. > On the flag day, the final version would be to remove the localpkg > script and go to the modified /etc/rc which I posted last week. > Since by then, there should no longer be any junk files, and > foo/foo.sh semantics will be the same as /etc/rc.d, so that version > of /etc/rc should work as proposed. Ah, I see why the disconnect on localpkg-early above. I was thinking we'd do the rcordering in /etc/rc in B which would change things a bit, but could still be basically compatible. Just doing it in localpkg seems like it may not offer the benefits people want. > > I'd like to whine about any files that aren't run, probalby in localpkg. > > It's fairly easy to do and would provide a push to get rid of the > > various .sample bits. > >=20 > Agreed - see above. >=20 >=20 > > > C. AT FUTURE FLAGDAY: > > > /etc/rc.d+local rcordered with "foo" run in subshell and > > > "foo.sh" sourced; "foo.xyz" files now treated > > > as "foo" > > > ACTION required of port maintainers: > > > - add rcorder tags to all scripts > > > - rename "foo.sh" to "foo" unless sourced > > > behavior is desired > >=20 > > I think we should be able to automate this via USE_RC_SUBR and/or > > RC_ORDER. > >=20 >=20 > I'm worried that using these keywords as the control to install > files/foo.sh.in as rc.d/foo makes it hard to distunguish between > ports which want to install both foo.sh and foo startup scripts > (the former to be sourced, the latter to be run in a subshell)? It > may be easier just to require port maintainers to rename files/foo.sh.in > to files/foo.in which they can do at any point the transition period. I'm more concerned about supporting installing .sh scripts on 5.x for the next two years than I am about supporting the installation of .sh scripts to be sourced two years now. > > > My thought is that to oblige port maintainers to make changes in > > > the short term will be hard. Give them some time (between points > > > B. and C. and acceptance of the change will be a lot easier). > > >=20 > > > So let's provide intermediate rc, rc.subr and localpkg scripts that > > > may be larger and more complex, but which don't place an immediate > > > burden on 13,000 port maintainers. Then provide a final set of > > > scripts which do. The intermediate scripts can provide warning > > > messages that alert that a change may be needed. > >=20 > > I agree. I'd like to do the spadework to make the major benefits > > available for 6.0 and then take the time between 6.0 and 7.0 to work > > towards the flag day. There's no reason not to make the full transition > > in ports before 7.0 so all the flagday does is make old junk stop > > working, as long as we do the work to warn about old style bits from > > the beginning. > >=20 > I'm surprised you're saying we need to wait as long as 7.0 for the > flag day. Isn't that over 18 months away? Wouldn't something like > a three or six month transition period be enough? After a HEADSUP and > warnings, I'd imagine that would be long enough for port maintainers > to make the needed changes. If we can't make major changes to the startup script processing in the 6.x line once 6.0-RELEASE happens. Anything that would break user scripts would be specifically disallowed. The rule of the project is that we generally have to deprecate a major interface for one release branch before we can break it. The rules for determining which scripts are run definitely falls into this category. Remember, we're not just dealing with ports, we're also dealing with weird user scripts so we need to give them plenty of warning. If we weren't so close to 6.0 release, we might be able to get away with warnings in 5.x and full deprecation in 6.0, but I think we're too late for that. This is why I'd like to see some modifications to /etc/rc in addition to localpkg. -- Brooks --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --NDin8bjvE/0mNLFQ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFCsGWrXY6L6fI4GtQRAr2UAKCm7qCBJRT18cL/IYtazOdk/iRWEACgxuz2 x6U5P9l24tAq0RZ9RwnPNtc= =vsY3 -----END PGP SIGNATURE----- --NDin8bjvE/0mNLFQ-- From owner-freebsd-rc@FreeBSD.ORG Fri Jun 17 13:02:41 2005 Return-Path: X-Original-To: freebsd-rc@FreeBSD.org Delivered-To: freebsd-rc@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D17F16A41C; Fri, 17 Jun 2005 13:02:41 +0000 (GMT) (envelope-from jr@opal.com) Received: from smtp.vzavenue.net (smtp.vzavenue.net [66.171.59.140]) by mx1.FreeBSD.org (Postfix) with ESMTP id C78D643D4C; Fri, 17 Jun 2005 13:02:40 +0000 (GMT) (envelope-from jr@opal.com) Received: from linwhf.opal.com (112.79.171.66.subscriber.vzavenue.net [66.171.79.112]) by smtp.vzavenue.net (MOS 3.4.8-GR) with ESMTP id CKD19198; Fri, 17 Jun 2005 09:01:25 -0400 (EDT) Received: from ASSP-nospam (localhost [127.0.0.1]) by linwhf.opal.com (8.13.3/8.13.3) with ESMTP id j5HD1PLh049108; Fri, 17 Jun 2005 09:01:25 -0400 (EDT) (envelope-from jr@opal.com) Received: from 127.0.0.1 ([127.0.0.1] helo=linwhf.opal.com) by ASSP-nospam ; 17 Jun 05 13:01:25 -0000 Received: (from jr@localhost) by linwhf.opal.com (8.13.3/8.13.3/Submit) id j5HD1MBw049107; Fri, 17 Jun 2005 09:01:22 -0400 (EDT) (envelope-from jr) Date: Fri, 17 Jun 2005 09:01:22 -0400 From: "J.R. Oldroyd" To: JM Message-ID: <20050617130122.GL16676@linwhf.opal.com> References: <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg> <20050613005533.GA28966@odin.ac.hmc.edu> <42AD19C9.2040403@FreeBSD.org> <20050613155211.GB19722@odin.ac.hmc.edu> <20050614134732.GB16676@linwhf.opal.com> <20050614172740.GC20371@odin.ac.hmc.edu> <20050615162948.GG16676@linwhf.opal.com> <42B05C7C.6060301@speakeasy.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <42B05C7C.6060301@speakeasy.net> User-Agent: Mutt/1.4.2.1i X-Junkmail-Status: score=0/50, host=smtp.vzavenue.net Cc: Doug Barton , freebsd-rc@FreeBSD.org Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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: Fri, 17 Jun 2005 13:02:41 -0000 On Jun 15, 12:51, JM wrote: > > > > rcorder and process all the remianing local scripts > > (rcorder will include non-tagged files at the > > end of its sorted list, so these are included here > > too): > > > > - warn and don't run non-executable files > > > > - warn and don't run files named "*.sample", > > "*.bak", "*.orig" etc > > > > - warn (suggesting name change) but do run (in > > subshell) files named "[^0-9]*.sh" without > > new RC_SUBR keyword > > > > - quietly run (as sourced file) files named > > "[^0-9]*.sh" which have new RC_SUBR keyword > > (but note that we're in localpkg here, not > > /etc/rc so sourcing not quite the same, unless > > we do move this functionality into /etc/rc now) > > > > - quietly run (in subshell) all other files with > > rcorder tags > > > > - warn and don't run any remaining files > > > > > shouldn't rcorder be run through /usr/local/etc/rc.d before it searches > for and executes *.sh files? perhaps mimic the current /etc/rc.d > mechanism where a piece of rcorder includes "local package > initialization" (which could be potentially renamed to "starting legacy > .sh scripts" that runs as a part of rcorder... basically nesting a > mirror image of rcorder within the main rcorder that runs through > /etc/rc.d... this is the only suggestion i have with my limited > knowledge of rc scripts. if it sounds dumb just disregard >.> > > but i would think that you would want to put more emphasis on change, > and executing rcorder scripts first would help to ensure this. > Other than finding and running local files named [0-9]*.sh first, I am proposing that rcorder then be used to sort the rest, so files named foo.sh and foo will be run in the rcordered order, regardless of suffix. The only reason to run files named [0-9]*.sh first is to preserve current behavior during the transition period. This part will go in the final version. -jr From owner-freebsd-rc@FreeBSD.ORG Fri Jun 17 13:38:49 2005 Return-Path: X-Original-To: freebsd-rc@FreeBSD.org Delivered-To: freebsd-rc@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 23D6516A41C; Fri, 17 Jun 2005 13:38:49 +0000 (GMT) (envelope-from jr@opal.com) Received: from smtp.vzavenue.net (smtp.vzavenue.net [66.171.59.140]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8227443D53; Fri, 17 Jun 2005 13:38:48 +0000 (GMT) (envelope-from jr@opal.com) Received: from linwhf.opal.com (112.79.171.66.subscriber.vzavenue.net [66.171.79.112]) by smtp.vzavenue.net (MOS 3.4.8-GR) with ESMTP id CKE01284; Fri, 17 Jun 2005 09:38:32 -0400 (EDT) Received: from ASSP-nospam (localhost [127.0.0.1]) by linwhf.opal.com (8.13.3/8.13.3) with ESMTP id j5HDcWmS049364; Fri, 17 Jun 2005 09:38:32 -0400 (EDT) (envelope-from jr@opal.com) Received: from 127.0.0.1 ([127.0.0.1] helo=linwhf.opal.com) by ASSP-nospam ; 17 Jun 05 13:38:32 -0000 Received: (from jr@localhost) by linwhf.opal.com (8.13.3/8.13.3/Submit) id j5HDcVXA049363; Fri, 17 Jun 2005 09:38:31 -0400 (EDT) (envelope-from jr) Date: Fri, 17 Jun 2005 09:38:31 -0400 From: "J.R. Oldroyd" To: Brooks Davis Message-ID: <20050617133831.GM16676@linwhf.opal.com> References: <42A8A91B.8000402@FreeBSD.org> <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg> <20050613005533.GA28966@odin.ac.hmc.edu> <42AD19C9.2040403@FreeBSD.org> <20050613155211.GB19722@odin.ac.hmc.edu> <20050614134732.GB16676@linwhf.opal.com> <20050614172740.GC20371@odin.ac.hmc.edu> <20050615162948.GG16676@linwhf.opal.com> <20050615173021.GB15807@odin.ac.hmc.edu> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="fOHHtNG4YXGJ0yqR" Content-Disposition: inline In-Reply-To: <20050615173021.GB15807@odin.ac.hmc.edu> User-Agent: Mutt/1.4.2.1i X-Junkmail-Status: score=0/50, host=smtp.vzavenue.net Cc: Doug Barton , freebsd-rc@FreeBSD.org Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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: Fri, 17 Jun 2005 13:38:49 -0000 --fOHHtNG4YXGJ0yqR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Jun 15, 10:30, Brooks Davis wrote: > On Wed, Jun 15, 2005 at 12:29:48PM -0400, J.R. Oldroyd wrote: > > >=20 > > I meant first in localpkg. Or in a localpkg-early script, but I don't > > see the need for an extra script. >=20 > The reason I think we may need an early script is that we're going to be > moving some scripts well before localpkg. >=20 OK, I see now localpkg isn't run 'till later than I realized. So a new localpkg-early would run just after mountcritremote/MOUNTDONE? Would it just run the [0-9]*.sh files or would it also handle files tagged with "bootearly" as Doug proposed? > I think *.* is fine. I'd prefer to complain about them from the > beginning so we catch any exceptions (possibly suppressing warnings for > obvious examples like *.bak, *.orig, *.sample). >=20 OK on the pattern, but don't we specifically want warnings for those files - they're precisely the ones we want folk to move. > > If we're not changing /etc/rc and adding the transition functionality > > in localpkg, the transition localpkg will have to: > >=20 > > ... > > > I'd rather not support sourcing at all until full transition. I'd > rather force porters to install files in /etc/rc.d for now if they want > sourcing. >=20 > ... > > Ah, I see why the disconnect on localpkg-early above. I was thinking > we'd do the rcordering in /etc/rc in B which would change things a bit, > but could still be basically compatible. Hmm. I thought that for the transitional version, we'd agreed to NOT change /etc/rc or rc.subr so everything would be done in localpkg with a possible localpkg-early. If you're now thinking we are OK to change /etc/rc and rc.subr even for the transitional version, I'm not clear why we'd keep localpkg at all and I don't see why we don't offer sourcing right away either, as long as we can clearly tell which files want it (which a new keyword would be a good indicator of). > I'm more concerned about supporting installing .sh scripts on 5.x for > the next two years than I am about supporting the installation of .sh > scripts to be sourced two years now. >=20 Based on your comment below, presumably this change won't need to go into the 5.x branch at all. I'm now reading what you're saying as meaning we should put the transitional scripts into head and into the 6-RELEASE branch, and put the final one into 7.0. =20 > > If we can't make major changes to the startup script processing in the > 6.x line once 6.0-RELEASE happens. Anything that would break user > scripts would be specifically disallowed. The rule of the project is > that we generally have to deprecate a major interface for one release > branch before we can break it. The rules for determining which scripts > are run definitely falls into this category. Remember, we're not just > dealing with ports, we're also dealing with weird user scripts so we > need to give them plenty of warning. If we weren't so close to 6.0 > release, we might be able to get away with warnings in 5.x and full > deprecation in 6.0, but I think we're too late for that. This is why > I'd like to see some modifications to /etc/rc in addition to localpkg. >=20 So be it then. Seems like a long transition to me, but if those are the rules, no problem. So what's needed next? Do you want more patch suggestions from me? If so, I still need to clear up whether it's rc/rc.subr that'll change or localpkg/localpkg-early or all of these. Or, do you and Doug have enough to take it from here? -jr --fOHHtNG4YXGJ0yqR Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (FreeBSD) iQDVAwUBQrLSV0kkqUax7f6FAQJC1gYAhDIu3P8hOxgSJHmyfjdKy59+duFUkQLJ muA3J3tlsLxkn6YVBhFz9tEEmrmaqNf7aQ9Nd3WO+9YI4kdIi67+GcZnP8PA3/Fd WbFD9fce0YrMz5ALXlf8E7vy0JUMoh0+8k9PnTotBB+Di52lXbr2YBv94TfciJkm noPr9fn/z4R0smOC3wm9KkOXw0rYbanIAlqMLr4yl2vcpuMBgjol//7Anfq+zu1c IU7GzLANi5//Suk4Ag2poO1NtP6H+zvX =oLJv -----END PGP SIGNATURE----- --fOHHtNG4YXGJ0yqR-- From owner-freebsd-rc@FreeBSD.ORG Fri Jun 17 18:18:50 2005 Return-Path: X-Original-To: freebsd-rc@FreeBSD.org Delivered-To: freebsd-rc@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7ED916A41C; Fri, 17 Jun 2005 18:18:50 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FD7B43D4C; Fri, 17 Jun 2005 18:18:50 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id j5HIIonm029634; Fri, 17 Jun 2005 11:18:50 -0700 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id j5HIInj8029633; Fri, 17 Jun 2005 11:18:49 -0700 Date: Fri, 17 Jun 2005 11:18:49 -0700 From: Brooks Davis To: "J.R. Oldroyd" Message-ID: <20050617181849.GF20342@odin.ac.hmc.edu> References: <20050609210223.GB16168@odin.ac.hmc.edu> <20050612121504.K844@ync.qbhto.arg> <20050613005533.GA28966@odin.ac.hmc.edu> <42AD19C9.2040403@FreeBSD.org> <20050613155211.GB19722@odin.ac.hmc.edu> <20050614134732.GB16676@linwhf.opal.com> <20050614172740.GC20371@odin.ac.hmc.edu> <20050615162948.GG16676@linwhf.opal.com> <20050615173021.GB15807@odin.ac.hmc.edu> <20050617133831.GM16676@linwhf.opal.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="65ImJOski3p8EhYV" Content-Disposition: inline In-Reply-To: <20050617133831.GM16676@linwhf.opal.com> User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu Cc: Doug Barton , freebsd-rc@FreeBSD.org Subject: Re: Use of rcorder for local rc.d/*.sh scripts 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: Fri, 17 Jun 2005 18:18:51 -0000 --65ImJOski3p8EhYV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Summary: after a fair bit of waffling, I've decided the issue of transition complexity argues for only modifying localpkg at this time. On Fri, Jun 17, 2005 at 09:38:31AM -0400, J.R. Oldroyd wrote: > On Jun 15, 10:30, Brooks Davis wrote: > > On Wed, Jun 15, 2005 at 12:29:48PM -0400, J.R. Oldroyd wrote: > > > >=20 > > > I meant first in localpkg. Or in a localpkg-early script, but I don't > > > see the need for an extra script. > >=20 > > The reason I think we may need an early script is that we're going to be > > moving some scripts well before localpkg. > >=20 > OK, I see now localpkg isn't run 'till later than I realized. So > a new localpkg-early would run just after mountcritremote/MOUNTDONE? > Would it just run the [0-9]*.sh files or would it also handle files > tagged with "bootearly" as Doug proposed? I would like to see it only handle [0-9]*.sh. I would strongly prefer a solution with no tags. > > I think *.* is fine. I'd prefer to complain about them from the > > beginning so we catch any exceptions (possibly suppressing warnings for > > obvious examples like *.bak, *.orig, *.sample). > >=20 > OK on the pattern, but don't we specifically want warnings for those > files - they're precisely the ones we want folk to move. I think my thought there was that we'd warn that we were skipping files we might actually want to run. (I'm not sure though since you've trimmed so much context). Warning on all of them is fine. > > > If we're not changing /etc/rc and adding the transition functionality > > > in localpkg, the transition localpkg will have to: > > >=20 > > > ... > > > > > I'd rather not support sourcing at all until full transition. I'd > > rather force porters to install files in /etc/rc.d for now if they want > > sourcing. > >=20 > > ... > > > > Ah, I see why the disconnect on localpkg-early above. I was thinking > > we'd do the rcordering in /etc/rc in B which would change things a bit, > > but could still be basically compatible. >=20 > Hmm. I thought that for the transitional version, we'd agreed to NOT > change /etc/rc or rc.subr so everything would be done in localpkg with > a possible localpkg-early. If we don't change rc, there's no point in localpkg-early. I'm of two minds about changing /etc/rc. If we don't change it things are simpler, but we get only part of the benefits of rcordering. We would get the benefits I'd personally use most (the ability of ports to depend on each other), but some people seem to want to start things in other places. > If you're now thinking we are OK to change /etc/rc and rc.subr even > for the transitional version, I'm not clear why we'd keep localpkg > at all and I don't see why we don't offer sourcing right away either, > as long as we can clearly tell which files want it (which a new keyword > would be a good indicator of). I'd like to run non-rc.d scripts where they used to be run, rather than pushing them all the way to the end. That may not matter much, though I certainly want them to run before bgfsck kicks off incase they take longer than background_fsck_delay to start. I feel sourcing is of extreamly limited usefulness so I'd rather put it off than deal with adding and processing tags to handle it. > > I'm more concerned about supporting installing .sh scripts on 5.x for > > the next two years than I am about supporting the installation of .sh > > scripts to be sourced two years now. > >=20 > Based on your comment below, presumably this change won't need to go > into the 5.x branch at all. I'm now reading what you're saying as meaning > we should put the transitional scripts into head and into the 6-RELEASE > branch, and put the final one into 7.0. Yes, that's how things work. > > If we can't make major changes to the startup script processing in the > > 6.x line once 6.0-RELEASE happens. Anything that would break user > > scripts would be specifically disallowed. The rule of the project is > > that we generally have to deprecate a major interface for one release > > branch before we can break it. The rules for determining which scripts > > are run definitely falls into this category. Remember, we're not just > > dealing with ports, we're also dealing with weird user scripts so we > > need to give them plenty of warning. If we weren't so close to 6.0 > > release, we might be able to get away with warnings in 5.x and full > > deprecation in 6.0, but I think we're too late for that. This is why > > I'd like to see some modifications to /etc/rc in addition to localpkg. > >=20 > So be it then. Seems like a long transition to me, but if those are > the rules, no problem. Those the rules because we get enough screaming if we make incompatable changes between releases with plenty of notice and documentation. It's annoying sometimes, but especialy when dealing with ports, we're stuck with it. > So what's needed next? Do you want more patch suggestions from me? > If so, I still need to clear up whether it's rc/rc.subr that'll > change or localpkg/localpkg-early or all of these. Or, do you and > Doug have enough to take it from here? I think we're agreed that our end goal is that in 7.0 all scripts in $local_startup will be sorted into the full set of scripts after mountcritremote. Now we need to nail down our feature set for 6.0 and get it implemented. I'm going to be gone all next week so I won't be able to help much with that unfortunatly. When I get back, network interface startup issues will be my priority so I'd prefer it if you could work on patches. The problem I've been having with decided if we should confine changes to localpkg is that I don't have enough information about what users want from rcordering. I'd like to be able to specify ordering between ports or between daemons in the same port. If that's what most other people need, we should just modify localpkg and put /etc/rc modifications off until later. I'm not sure how useful full ordering is in practice. One major advantage of purly localpkg just occured to me which is that if we do that, we can avoid all the special casing in /etc/rc because we'll only make changes there when we do the full transtion. I think that's sufficently compelling to vote for localpkg. Port maintainers who want full rcordering can still use RC_ORDER to install their scripts in /etc/rc.d so that's not a big limitation. In that case I think we need two things before 6.0. First, an updated localpkg script. Second, modifications to bsd.port.mk to support installation of rc.d script with or without .sh extensions based on OSVERSION (to be bumped when localpkg is updated). My prefrence at the moment is to just strip the .sh from the scripts listed in USE_RC_SUBR and have people who want their scripts sourced use RC_ORDER to install them in /etc/rc.d. -- Brooks --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --65ImJOski3p8EhYV Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFCsxQIXY6L6fI4GtQRAmfVAKC39TiAywTstYm7+Xdh9DE70WOTIwCg0Kg/ JIt0N8IlebA7F6YVMQ+JbYw= =xnA+ -----END PGP SIGNATURE----- --65ImJOski3p8EhYV--