From owner-freebsd-rc@FreeBSD.ORG Tue Dec 20 00:22:09 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 90A1B16A41F for ; Tue, 20 Dec 2005 00:22:09 +0000 (GMT) (envelope-from flz@xbsd.org) Received: from smtp.xbsd.org (xbsd.org [82.233.2.192]) by mx1.FreeBSD.org (Postfix) with ESMTP id A63B043D45 for ; Tue, 20 Dec 2005 00:22:05 +0000 (GMT) (envelope-from flz@xbsd.org) Received: from localhost (localhost.xbsd.org [127.0.0.1]) by smtp.xbsd.org (Postfix) with ESMTP id A5E6F11B7A; Tue, 20 Dec 2005 01:22:04 +0100 (CET) Received: from smtp.xbsd.org ([127.0.0.1]) by localhost (srv1.xbsd.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 17827-04; Tue, 20 Dec 2005 01:21:55 +0100 (CET) Received: from cream.xbsd.org (cream.xbsd.org [192.168.42.6]) by smtp.xbsd.org (Postfix) with ESMTP id C24B71171F; Tue, 20 Dec 2005 01:21:54 +0100 (CET) From: Florent Thoumie To: Brooks Davis In-Reply-To: <20051219203322.GC1103@odin.ac.hmc.edu> References: <1134927080.744.14.camel@cream.xbsd.org> <20051219203322.GC1103@odin.ac.hmc.edu> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-gHg4RMnzCEg3tNumaH3R" Date: Tue, 20 Dec 2005 01:21:53 +0100 Message-Id: <1135038113.744.51.camel@cream.xbsd.org> Mime-Version: 1.0 X-Mailer: Evolution 2.4.2.1 FreeBSD GNOME Team Port X-Virus-Scanned: amavisd-new at xbsd.org Cc: freebsd-rc@freebsd.org Subject: Re: rc.d/ldconfig change 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, 20 Dec 2005 00:22:09 -0000 --=-gHg4RMnzCEg3tNumaH3R Content-Type: multipart/mixed; boundary="=-hHJru6bcd39vPbNwC1pO" --=-hHJru6bcd39vPbNwC1pO Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Mon, 2005-12-19 at 12:33 -0800, Brooks Davis wrote: > On Sun, Dec 18, 2005 at 06:31:20PM +0100, Florent Thoumie wrote: > > Since we have some ports that want to ldconfig directories early > > in the boot process (actually, early in localpkg sequence), I=20 > > think it would be a good idee to support=20 > > ${PREFIX}/etc/ld.so.conf.d/ directories (or whatever the name). > >=20 > > Here's what I was thinking about (see attached patch). > >=20 > > This way, I can imagine a USE_LDCONFIG variable containing=20 > > directories and bsd.port.mk would just : > >=20 > > .if defined(USE_LDCONFIG) > > echo ${USE_LDCONFIG} > ${PREFIX}/etc/ld.so.conf.d/${UNIQUENAME} > > .endif > >=20 > > [...] instead of installing 000.${UNIQUENAME}.sh in=20 > > ${PREFIX}/etc/rc.d. > >=20 > > I guess it should be ok since /etc/rc.d/ldconfig is launched=20 > > after /etc/rc.d/mountcritremote. We can assume that local=20 > > directories will be available (by default local_ldconfig=3D""). >=20 > Sounds good to me. I'd been thinking we could use something like > this since all those scripts are ugly. This nice thing about this > is that we could use a compatibility port that just installs a > 000.ldconfig-compat.sh script to shim old versions to allow the hack > script to die in ports almost immediately. Here's the (almost) complete patch. I'll take care of the ports=20 part once we get this in the tree. I finally set local_ldconfig to "/usr/local/etc/ld.so.conf.d /usr/X11R6/etc/ld.so.conf.d" because we already have=20 local_startup and local_periodic (in etc/defaults/periodic.conf) using such directories (and that's one thing less the user has=20 to do). I've added an entry in the local mtree file and bumped=20 __FreeBSD_version. Someone could argue the directory's name (ld.so.conf.d), I=20 really don't care, I figured it was simple enough so that anyone would know what it is for. --=20 Florent Thoumie flz@FreeBSD.org FreeBSD committer --=-hHJru6bcd39vPbNwC1pO Content-Disposition: attachment; filename=ldconfig.diff Content-Type: text/x-patch; name=ldconfig.diff; charset=us-ascii Content-Transfer-Encoding: base64 SW5kZXg6IGV0Yy9kZWZhdWx0cy9yYy5jb25mDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2hvbWUv bmN2cy9zcmMvZXRjL2RlZmF1bHRzL3JjLmNvbmYsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjI2 Nw0KZGlmZiAtdSAtcjEuMjY3IHJjLmNvbmYNCi0tLSBldGMvZGVmYXVsdHMvcmMuY29uZgkxNSBE ZWMgMjAwNSAwMTowNDo0OCAtMDAwMAkxLjI2Nw0KKysrIGV0Yy9kZWZhdWx0cy9yYy5jb25mCTIw IERlYyAyMDA1IDAwOjE4OjIxIC0wMDAwDQpAQCAtNDkzLDYgKzQ5Myw4IEBADQogCQkJIyBzaGFy ZWQgbGlicmFyeSBzZWFyY2ggcGF0aHMNCiBsZGNvbmZpZ19wYXRoc19hb3V0PSIvdXNyL2xpYi9j b21wYXQvYW91dCAvdXNyL1gxMVI2L2xpYi9hb3V0IC91c3IvbG9jYWwvbGliL2FvdXQiDQogCQkJ IyBhLm91dCBzaGFyZWQgbGlicmFyeSBzZWFyY2ggcGF0aHMNCitsb2NhbF9sZGNvbmZpZz0iL3Vz ci9sb2NhbC9ldGMvbGQuc28uY29uZi5kIC91c3IvWDExUjYvZXRjL2xkLnNvLmNvbmYuZCINCisJ CQkjIExvY2FsIGRpcmVjdG9yaWVzIHdpdGggbGRjb25maWcgY29uZmlndXJhdGlvbiBmaWxlcy4N CiBrZXJuX3NlY3VyZWxldmVsX2VuYWJsZT0iTk8iCSMga2VybmVsIHNlY3VyaXR5IGxldmVsIChz ZWUgaW5pdCg4KSksDQoga2Vybl9zZWN1cmVsZXZlbD0iLTEiCSMgcmFuZ2U6IC0xLi4zIDsgYC0x JyBpcyB0aGUgbW9zdCBpbnNlY3VyZQ0KIAkJCSMgTm90ZSB0aGF0IHNldHRpbmcgc2VjdXJlbGV2 ZWwgdG8gMCB3aWxsIHJlc3VsdA0KSW5kZXg6IGV0Yy9yYy5kL2xkY29uZmlnDQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 DQpSQ1MgZmlsZTogL2hvbWUvbmN2cy9zcmMvZXRjL3JjLmQvbGRjb25maWcsdg0KcmV0cmlldmlu ZyByZXZpc2lvbiAxLjE0DQpkaWZmIC11IC1yMS4xNCBsZGNvbmZpZw0KLS0tIGV0Yy9yYy5kL2xk Y29uZmlnCTE2IEphbiAyMDA1IDA4OjM0OjMwIC0wMDAwCTEuMTQNCisrKyBldGMvcmMuZC9sZGNv bmZpZwkyMCBEZWMgMjAwNSAwMDoxODoyMSAtMDAwMA0KQEAgLTIyLDYgKzIyLDExIEBADQogCWNo ZWNreWVzbm8gbGRjb25maWdfaW5zZWN1cmUgJiYgX2lucz0iLWkiDQogCWlmIFsgLXggIiR7bGRj b25maWdfY29tbWFuZH0iIF07IHRoZW4NCiAJCV9MREM9Ii9saWIgL3Vzci9saWIiDQorCQlmb3Ig aSBpbiAke2xvY2FsX2xkY29uZmlnfTsgZG8NCisJCQlpZiBbIC1kICIke2l9IiBdOyB0aGVuDQor CQkJCWxkY29uZmlnX3BhdGhzPSIke2xkY29uZmlnX3BhdGhzfSBgbHMgJHtpfWAiDQorCQkJZmkN CisJCWRvbmUNCiAJCWZvciBpIGluICR7bGRjb25maWdfcGF0aHN9IC9ldGMvbGQtZWxmLnNvLmNv bmY7IGRvDQogCQkJaWYgWyAtciAiJHtpfSIgXTsgdGhlbg0KIAkJCQlfTERDPSIke19MREN9ICR7 aX0iDQpJbmRleDogc2hhcmUvbWFuL21hbjUvcmMuY29uZi41DQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmls ZTogL2hvbWUvbmN2cy9zcmMvc2hhcmUvbWFuL21hbjUvcmMuY29uZi41LHYNCnJldHJpZXZpbmcg cmV2aXNpb24gMS4yNzQNCmRpZmYgLXUgLXIxLjI3NCByYy5jb25mLjUNCi0tLSBzaGFyZS9tYW4v bWFuNS9yYy5jb25mLjUJMTkgRGVjIDIwMDUgMTA6NTc6MDAgLTAwMDAJMS4yNzQNCisrKyBzaGFy ZS9tYW4vbWFuNS9yYy5jb25mLjUJMjAgRGVjIDIwMDUgMDA6MTg6MjIgLTAwMDANCkBAIC0yODIy LDYgKzI4MjIsMTMgQEANCiBTZXQgdGhpcyB2YXJpYWJsZSB0bw0KIC5EcSBMaSBZRVMNCiB0byBk aXNhYmxlIHRoYXQgc2VjdXJpdHkgY2hlY2sgZHVyaW5nIHN5c3RlbSBzdGFydHVwLg0KKy5JdCBW YSBsb2NhbF9sZGNvbmZpZw0KKy5QcSBWdCBzdHINCitTZXQgdG8gdGhlIGxpc3Qgb2YgbG9jYWwN CisuWHIgbGRjb25maWcgOA0KK2RpcmVjdG9yaWVzLg0KK0VhY2ggZmlsZSBpbiB0aG9zZSBkaXJl Y3RvcmllcyB3aWxsIGJlIHBhc3NlZCBhcyBhcmd1bWVudHMgdG8NCisuWHIgbGRjb25maWcgOCAu DQogLkl0IFZhIGtlcm5fc2VjdXJlbGV2ZWxfZW5hYmxlDQogLlBxIFZ0IGJvb2wNCiBTZXQgdG8N CkluZGV4OiBzeXMvc3lzL3BhcmFtLmgNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvaG9tZS9uY3Zz L3NyYy9zeXMvc3lzL3BhcmFtLmgsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjI1Nw0KZGlmZiAt dSAtcjEuMjU3IHBhcmFtLmgNCi0tLSBzeXMvc3lzL3BhcmFtLmgJMTkgRGVjIDIwMDUgMDA6MTM6 MTEgLTAwMDAJMS4yNTcNCisrKyBzeXMvc3lzL3BhcmFtLmgJMjAgRGVjIDIwMDUgMDA6MTg6MjIg LTAwMDANCkBAIC01Nyw3ICs1Nyw3IEBADQogICoJCWlzIGNyZWF0ZWQsIG90aGVyd2lzZSAxLg0K ICAqLw0KICN1bmRlZiBfX0ZyZWVCU0RfdmVyc2lvbg0KLSNkZWZpbmUgX19GcmVlQlNEX3ZlcnNp b24gNzAwMDA5CS8qIE1hc3RlciwgcHJvcGFnYXRlZCB0byBuZXd2ZXJzICovDQorI2RlZmluZSBf X0ZyZWVCU0RfdmVyc2lvbiA3MDAwMTAJLyogTWFzdGVyLCBwcm9wYWdhdGVkIHRvIG5ld3ZlcnMg Ki8NCiANCiAjaWZuZGVmIExPQ09SRQ0KICNpbmNsdWRlIDxzeXMvdHlwZXMuaD4NCkluZGV4OiBl dGMvbXRyZWUvQlNELmxvY2FsLmRpc3QNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvaG9tZS9uY3Zz L3NyYy9ldGMvbXRyZWUvQlNELmxvY2FsLmRpc3Qsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjEx Nw0KZGlmZiAtdSAtcjEuMTE3IEJTRC5sb2NhbC5kaXN0DQotLS0gZXRjL210cmVlL0JTRC5sb2Nh bC5kaXN0CTEwIEp1biAyMDA1IDIwOjE0OjM4IC0wMDAwCTEuMTE3DQorKysgZXRjL210cmVlL0JT RC5sb2NhbC5kaXN0CTIwIERlYyAyMDA1IDAwOjE4OjIyIC0wMDAwDQpAQCAtOCw2ICs4LDggQEAN CiAgICAgYmluDQogICAgIC4uDQogICAgIGV0Yw0KKyAgICAgICAgbGQuc28uY29uZi5kDQorICAg ICAgICAuLg0KICAgICAgICAgcGFtLmQNCiAgICAgICAgIC4uDQogICAgICAgICByYy5kDQo= --=-hHJru6bcd39vPbNwC1pO-- --=-gHg4RMnzCEg3tNumaH3R Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQBDp06hMxEkbVFH3PQRAkZSAJ40J7k2kIYp9bXdpVTQ5VgN+mXVHACgje4O aykmp2ESaevyyLl5+qW0rRk= =tY+o -----END PGP SIGNATURE----- --=-gHg4RMnzCEg3tNumaH3R--