From owner-freebsd-rc@FreeBSD.ORG Fri Nov 30 09:50:01 2012 Return-Path: Delivered-To: freebsd-rc@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 69D8ABD9 for ; Fri, 30 Nov 2012 09:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 339D58FC08 for ; Fri, 30 Nov 2012 09:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qAU9o1VL086225 for ; Fri, 30 Nov 2012 09:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qAU9o1Yq086220; Fri, 30 Nov 2012 09:50:01 GMT (envelope-from gnats) Date: Fri, 30 Nov 2012 09:50:01 GMT Message-Id: <201211300950.qAU9o1Yq086220@freefall.freebsd.org> To: freebsd-rc@FreeBSD.org Cc: From: mitsuru y Subject: Re: conf/92523: [patch] allow rc scripts to kill process after a timeout X-BeenThere: freebsd-rc@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: mitsuru y 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, 30 Nov 2012 09:50:01 -0000 The following reply was made to PR conf/92523; it has been noted by GNATS. From: mitsuru y To: bug-followup@FreeBSD.org, lawrance@FreeBSD.org Cc: Subject: Re: conf/92523: [patch] allow rc scripts to kill process after a timeout Date: Fri, 30 Nov 2012 18:48:08 +0900 --f46d04479f3d0d266304cfb34c15 Content-Type: text/plain; charset=UTF-8 I have modified the patch. - to be applied cleanly for 8.2-RELEASE ( and 9-STABLE). - introduce default_stop_timeout - kill -KILL only if timeout -- mitsuru --f46d04479f3d0d266304cfb34c15 Content-Type: application/octet-stream; name="patch-rc.subr" Content-Disposition: attachment; filename="patch-rc.subr" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ha54nbi90 LS0tIHJjLnN1YnIub3JpZwkyMDEyLTExLTMwIDE3OjI5OjQ5LjAwMDAwMDAwMCArMDkwMAorKysg cmMuc3VicgkyMDEyLTExLTMwIDE4OjMyOjM2LjAwMDAwMDAwMCArMDkwMApAQCAtMzk4LDYgKzM5 OCw0MiBAQAogfQogCiAjCisjIHdhaXRfbWF4X2Zvcl9waWRzIHRpbWVvdXQgcGlkIFtwaWQgLi4u XQorIwlzcGlucyB1bnRpbCBub25lIG9mIHRoZSBwaWRzIGV4aXN0LCBvciB1bnRpbCBhIG1heGlt dW0gb2YKKyMJInRpbWVvdXQiIHNlY29uZHMgaGF2ZSBlbGFwc2VkICh3aGljaGV2ZXIgY29tZXMg Zmlyc3QpLgorIword2FpdF9tYXhfZm9yX3BpZHMoKQoreworCV90aW1lb3V0PSQxCisJc2hpZnQK KwlfbGlzdD0iJEAiCisJaWYgWyAteiAiJF9saXN0IiBdOyB0aGVuCisJCXJldHVybiAwCisJZmkK KwlfcHJlZml4PQorCXdoaWxlIFsgJF90aW1lb3V0IC1ndCAwIF0gOyBkbworCQlfbmxpc3Q9IiI7 CisJCWZvciBfaiBpbiAkX2xpc3Q7IGRvCisJCQlpZiBraWxsIC0wICRfaiAyPi9kZXYvbnVsbDsg dGhlbgorCQkJCV9ubGlzdD0iJHtfbmxpc3R9JHtfbmxpc3Q6KyB9JF9qIgorCQkJZmkKKwkJZG9u ZQorCQlpZiBbIC16ICIkX25saXN0IiBdOyB0aGVuCisJCQlyZXR1cm4gMAorCQlmaQorCQlfbGlz dD0kX25saXN0CisJCWVjaG8gLW4gJHtfcHJlZml4Oi0iV2FpdGluZyAobWF4ICRfdGltZW91dCBz ZWNzKSBmb3IgUElEUzogIn0kX2xpc3QKKwkJX3ByZWZpeD0iLCAiCisJCXNsZWVwIDIKKwkJX3Rp bWVvdXQ9JCgoJF90aW1lb3V0LTIpKQorCWRvbmUKKwlpZiBbIC1uICIkX3ByZWZpeCIgXTsgdGhl bgorCQllY2hvICIuIgorCWZpCisJcmV0dXJuIDEKK30KKworIwogIyBydW5fcmNfY29tbWFuZCBh cmd1bWVudAogIwlTZWFyY2ggZm9yIGFyZ3VtZW50IGluIHRoZSBsaXN0IG9mIHN1cHBvcnRlZCBj b21tYW5kcywgd2hpY2ggaXM6CiAjCQkic3RhcnQgc3RvcCByZXN0YXJ0IHJjdmFyIHN0YXR1cyBw b2xsICR7ZXh0cmFfY29tbWFuZHN9IgpAQCAtNzU3LDggKzc5MywxOCBAQAogCQkJX3J1bl9yY19k b2l0ICIkX2RvaXQiIHx8IHJldHVybiAxCiAKIAkJCQkJIyB3YWl0IGZvciB0aGUgY29tbWFuZCB0 byBleGl0LAorCQkJCQkjIGtpbGwgaXQgaWYgYSB0aW1lb3V0IGlzIHNwZWNpZmllZCwKIAkJCQkJ IyBhbmQgcnVuIHBvc3RjbWQuCi0JCQl3YWl0X2Zvcl9waWRzICRyY19waWQKKwkJCWV2YWwgX3Rp bWVvdXQ9XCQke25hbWV9X3N0b3BfdGltZW91dAorCQkJaWYgWyAteiAkX3RpbWVvdXQgXTsgdGhl bgorCQkJCWV2YWwgX3RpbWVvdXQ9JGRlZmF1bHRfc3RvcF90aW1lb3V0CisJCQlmaQorCQkJaWYg WyAke190aW1lb3V0Oi0wfSAtZ3QgMCBdOyB0aGVuCisJCQkJd2FpdF9tYXhfZm9yX3BpZHMgJHtf dGltZW91dH0gJHJjX3BpZCB8fCBcCisJCQkJZWNobyBraWxsIC1LSUxMICRyY19waWQKKwkJCWVs c2UKKwkJCQl3YWl0X2Zvcl9waWRzICRyY19waWQKKwkJCWZpCiAKIAkJCV9ydW5fcmNfcG9zdGNt ZAogCQkJOzsK --f46d04479f3d0d266304cfb34c15--