Date: Sun, 21 Aug 2011 00:38:11 -0700 From: Xin LI <delphij@delphij.net> To: freebsd-rc@FreeBSD.ORG Subject: [PATCH] Don't test if a service is enabled when it's required Message-ID: <4E50B5E3.90702@delphij.net>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------040006000003030000080701 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, Currently we do a checkyesno before doing forcestatus on a service that is required. However, this way if a dependent service is enabled but stopped, it would not be started. For instance: echo 'mountd_enable="YES"' >> /etc/rc.conf /etc/rc.d/mountd stop /etc/rc.d/nfsd stop /etc/rc.d/nfsd start Would not start mountd. I'd like to propose the attached patch since it doesn't seem to be necessary that we test the enable status before doing forcestatus. Comments? Cheers, -- Xin LI <delphij@delphij.net> https://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die --------------040006000003030000080701 Content-Type: text/plain; name="rc.d.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="rc.d.diff" SW5kZXg6IGFtZAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBhbWQJKHJldmlzaW9uIDIyNTA1NSkKKysr IGFtZAkod29ya2luZyBjb3B5KQpAQCAtMjMsOCArMjMsNyBAQAogCQlmb3JjZV9kZXBlbmQg bmZzY2xpZW50IHx8IHJldHVybiAxCiAJZmkKIAotCWlmICEgY2hlY2t5ZXNubyBycGNiaW5k X2VuYWJsZSAgJiYgXAotCSAgICAhIC9ldGMvcmMuZC9ycGNiaW5kIGZvcmNlc3RhdHVzIDE+ L2Rldi9udWxsIDI+JjEKKwlpZiAhIC9ldGMvcmMuZC9ycGNiaW5kIGZvcmNlc3RhdHVzIDE+ L2Rldi9udWxsIDI+JjEKIAl0aGVuCiAJCWZvcmNlX2RlcGVuZCBycGNiaW5kIHx8IHJldHVy biAxCiAJZmkKSW5kZXg6IHlwc2V0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHlwc2V0CShyZXZpc2lv biAyMjUwNTUpCisrKyB5cHNldAkod29ya2luZyBjb3B5KQpAQCAtMjAsMTMgKzIwLDExIEBA CiB7CiAJbG9jYWwgX2RvbWFpbgogCi0JaWYgISBjaGVja3llc25vIHJwY2JpbmRfZW5hYmxl ICAmJiBcCi0JICAgICEgL2V0Yy9yYy5kL3JwY2JpbmQgZm9yY2VzdGF0dXMgMT4vZGV2L251 bGwgMj4mMQorCWlmICEgL2V0Yy9yYy5kL3JwY2JpbmQgZm9yY2VzdGF0dXMgMT4vZGV2L251 bGwgMj4mMQogCXRoZW4KIAkJZm9yY2VfZGVwZW5kIHJwY2JpbmQgfHwgcmV0dXJuIDEKIAlm aQotCWlmICEgY2hlY2t5ZXNubyBuaXNfY2xpZW50X2VuYWJsZSAmJiBcCi0JICAgICEgL2V0 Yy9yYy5kL3lwYmluZCBmb3JjZXN0YXR1cyAxPi9kZXYvbnVsbCAyPiYxCisJaWYgISAvZXRj L3JjLmQveXBiaW5kIGZvcmNlc3RhdHVzIDE+L2Rldi9udWxsIDI+JjEKIAl0aGVuCiAJCWZv cmNlX2RlcGVuZCB5cGJpbmQgfHwgcmV0dXJuIDEKIAlmaQpJbmRleDogbW91bnRkCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIG1vdW50ZAkocmV2aXNpb24gMjI1MDU1KQorKysgbW91bnRkCSh3b3Jr aW5nIGNvcHkpCkBAIC0xOSw4ICsxOSw3IEBACiAKIG1vdW50ZF9wcmVjbWQoKQogewotCWlm ICEgY2hlY2t5ZXNubyBycGNiaW5kX2VuYWJsZSAgJiYgXAotCSAgICAhIC9ldGMvcmMuZC9y cGNiaW5kIGZvcmNlc3RhdHVzIDE+L2Rldi9udWxsIDI+JjEKKwlpZiAhIC9ldGMvcmMuZC9y cGNiaW5kIGZvcmNlc3RhdHVzIDE+L2Rldi9udWxsIDI+JjEKIAl0aGVuCiAJCWZvcmNlX2Rl cGVuZCBycGNiaW5kIHx8IHJldHVybiAxCiAJZmkKSW5kZXg6IHlwcGFzc3dkZAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSB5cHBhc3N3ZGQJKHJldmlzaW9uIDIyNTA1NSkKKysrIHlwcGFzc3dkZAko d29ya2luZyBjb3B5KQpAQCAtMjIsMTMgKzIyLDExIEBACiB7CiAJbG9jYWwgX2RvbWFpbgog Ci0JaWYgISBjaGVja3llc25vIHJwY2JpbmRfZW5hYmxlICAmJiBcCi0JICAgICEgL2V0Yy9y Yy5kL3JwY2JpbmQgZm9yY2VzdGF0dXMgMT4vZGV2L251bGwgMj4mMQorCWlmICEgL2V0Yy9y Yy5kL3JwY2JpbmQgZm9yY2VzdGF0dXMgMT4vZGV2L251bGwgMj4mMQogCXRoZW4KIAkJZm9y Y2VfZGVwZW5kIHJwY2JpbmQgfHwgcmV0dXJuIDEKIAlmaQotCWlmICEgY2hlY2t5ZXNubyBu aXNfc2VydmVyX2VuYWJsZSAmJiBcCi0JICAgICEgL2V0Yy9yYy5kL3lwc2VydiBmb3JjZXN0 YXR1cyAxPi9kZXYvbnVsbCAyPiYxCisJaWYgISAvZXRjL3JjLmQveXBzZXJ2IGZvcmNlc3Rh dHVzIDE+L2Rldi9udWxsIDI+JjEKIAl0aGVuCiAJCWZvcmNlX2RlcGVuZCB5cHNlcnYgfHwg cmV0dXJuIDEKIAlmaQpJbmRleDoga2V5c2Vydgo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBrZXlzZXJ2 CShyZXZpc2lvbiAyMjUwNTUpCisrKyBrZXlzZXJ2CSh3b3JraW5nIGNvcHkpCkBAIC0xOSw4 ICsxOSw3IEBACiAKIGtleXNlcnZfcHJlc3RhcnQoKQogewotCWlmICEgY2hlY2t5ZXNubyBy cGNiaW5kX2VuYWJsZSAgJiYgXAotCQkhIC9ldGMvcmMuZC9ycGNiaW5kIGZvcmNlc3RhdHVz IDE+L2Rldi9udWxsIDI+JjEKKwlpZiAhIC9ldGMvcmMuZC9ycGNiaW5kIGZvcmNlc3RhdHVz IDE+L2Rldi9udWxsIDI+JjEKIAl0aGVuCiAJCWZvcmNlX2RlcGVuZCBycGNiaW5kIHx8IHJl dHVybiAxCiAJZmkKSW5kZXg6IHlwdXBkYXRlZAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB5cHVwZGF0 ZWQJKHJldmlzaW9uIDIyNTA1NSkKKysrIHlwdXBkYXRlZAkod29ya2luZyBjb3B5KQpAQCAt MTgsMTMgKzE4LDExIEBACiB7CiAJbG9jYWwgX2RvbWFpbgogCi0JaWYgISBjaGVja3llc25v IHJwY2JpbmRfZW5hYmxlICAmJiBcCi0JICAgICEgL2V0Yy9yYy5kL3JwY2JpbmQgZm9yY2Vz dGF0dXMgMT4vZGV2L251bGwgMj4mMQorCWlmICEgL2V0Yy9yYy5kL3JwY2JpbmQgZm9yY2Vz dGF0dXMgMT4vZGV2L251bGwgMj4mMQogCXRoZW4KIAkJZm9yY2VfZGVwZW5kIHJwY2JpbmQg fHwgcmV0dXJuIDEKIAlmaQotCWlmICEgY2hlY2t5ZXNubyBuaXNfc2VydmVyX2VuYWJsZSAm JiBcCi0JICAgICEgL2V0Yy9yYy5kL3lwc2VydiBmb3JjZXN0YXR1cyAxPi9kZXYvbnVsbCAy PiYxCisJaWYgISAvZXRjL3JjLmQveXBzZXJ2IGZvcmNlc3RhdHVzIDE+L2Rldi9udWxsIDI+ JjEKIAl0aGVuCiAJCWZvcmNlX2RlcGVuZCB5cHNlcnYgfHwgcmV0dXJuIDEKIAlmaQpJbmRl eDogYXBtZAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBhcG1kCShyZXZpc2lvbiAyMjUwNTUpCisrKyBh cG1kCSh3b3JraW5nIGNvcHkpCkBAIC0xOSw5ICsxOSw4IEBACiB7CiAJY2FzZSBgJHtTWVND VExfTn0gaHcubWFjaGluZV9hcmNoYCBpbgogCWkzODYpCi0JCSMgRW5hYmxlIGFwbSBpZiBp dCBpcyBub3QgYWxyZWFkeSBlbmFibGVkCi0JCWlmICEgY2hlY2t5ZXNubyBhcG1fZW5hYmxl ICAmJiBcCi0JCSAgICAhIC9ldGMvcmMuZC9hcG0gZm9yY2VzdGF0dXMgMT4vZGV2L251bGwg Mj4mMQorCQkjIFN0YXJ0IGFwbSBpbiBjYXNlIGl0IHdhcyBub3QgYWxyZWFkeQorCQlpZiAh IC9ldGMvcmMuZC9hcG0gZm9yY2VzdGF0dXMgMT4vZGV2L251bGwgMj4mMQogCQl0aGVuCiAJ CQlmb3JjZV9kZXBlbmQgYXBtIHx8IHJldHVybiAxCiAJCWZpCkluZGV4OiBuZnNkCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIG5mc2QJKHJldmlzaW9uIDIyNTA1NSkKKysrIG5mc2QJKHdvcmtpbmcg Y29weSkKQEAgLTQzLDggKzQzLDcgQEAKIAkJZmkKIAogCQlpZiBjaGVja3llc25vIG5mc3Y0 X3NlcnZlcl9lbmFibGU7IHRoZW4KLQkJCWlmICEgY2hlY2t5ZXNubyBuZnN1c2VyZF9lbmFi bGUgICYmIFwKLQkJCSAgICAhIC9ldGMvcmMuZC9uZnN1c2VyZCBmb3JjZXN0YXR1cyAxPi9k ZXYvbnVsbCAyPiYxCisJCQlpZiAhIC9ldGMvcmMuZC9uZnN1c2VyZCBmb3JjZXN0YXR1cyAx Pi9kZXYvbnVsbCAyPiYxCiAJCQl0aGVuCiAJCQkJaWYgISBmb3JjZV9kZXBlbmQgbmZzdXNl cmQ7IHRoZW4KIAkJCQkJZXJyIDEgIkNhbm5vdCBydW4gbmZzdXNlcmQiCkBAIC01NiwxNCAr NTUsMTIgQEAKIAkJZmkKIAlmaQogCi0JaWYgISBjaGVja3llc25vIHJwY2JpbmRfZW5hYmxl ICAmJiBcCi0JICAgICEgL2V0Yy9yYy5kL3JwY2JpbmQgZm9yY2VzdGF0dXMgMT4vZGV2L251 bGwgMj4mMQorCWlmICEgL2V0Yy9yYy5kL3JwY2JpbmQgZm9yY2VzdGF0dXMgMT4vZGV2L251 bGwgMj4mMQogCXRoZW4KIAkJZm9yY2VfZGVwZW5kIHJwY2JpbmQgfHwgcmV0dXJuIDEKIAlm aQogCi0JaWYgISBjaGVja3llc25vIG1vdW50ZF9lbmFibGUgICYmIFwKLQkgICAgISAvZXRj L3JjLmQvbW91bnRkIGZvcmNlc3RhdHVzIDE+L2Rldi9udWxsIDI+JjEKKwlpZiAhIC9ldGMv cmMuZC9tb3VudGQgZm9yY2VzdGF0dXMgMT4vZGV2L251bGwgMj4mMQogCXRoZW4KIAkJZm9y Y2VfZGVwZW5kIG1vdW50ZCB8fCByZXR1cm4gMQogCWZpCkluZGV4OiBsb2NrZAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBsb2NrZAkocmV2aXNpb24gMjI1MDU1KQorKysgbG9ja2QJKHdvcmtpbmcg Y29weSkKQEAgLTMwLDggKzMwLDcgQEAKIAl0aGVuCiAJCXJldD0xCiAJZmkKLQlpZiAhIGNo ZWNreWVzbm8gcnBjYmluZF9lbmFibGUgJiYgXAotCSAgICAhIC9ldGMvcmMuZC9ycGNiaW5k IGZvcmNlc3RhdHVzIDE+L2Rldi9udWxsIDI+JjEKKwlpZiAhIC9ldGMvcmMuZC9ycGNiaW5k IGZvcmNlc3RhdHVzIDE+L2Rldi9udWxsIDI+JjEKIAl0aGVuCiAJCWZvcmNlX2RlcGVuZCBy cGNiaW5kIHx8IHJldD0xCiAJZmkKSW5kZXg6IHN0YXRkCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHN0 YXRkCShyZXZpc2lvbiAyMjUwNTUpCisrKyBzdGF0ZAkod29ya2luZyBjb3B5KQpAQCAtMzAs OCArMzAsNyBAQAogCXRoZW4KIAkJcmV0PTEKIAlmaQotCWlmICEgY2hlY2t5ZXNubyBycGNi aW5kX2VuYWJsZSAmJiBcCi0JICAgICEgL2V0Yy9yYy5kL3JwY2JpbmQgZm9yY2VzdGF0dXMg MT4vZGV2L251bGwgMj4mMQorCWlmICEgL2V0Yy9yYy5kL3JwY2JpbmQgZm9yY2VzdGF0dXMg MT4vZGV2L251bGwgMj4mMQogCXRoZW4KIAkJZm9yY2VfZGVwZW5kIHJwY2JpbmQgfHwgcmV0 PTEKIAlmaQpJbmRleDogeXBiaW5kCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHlwYmluZAkocmV2aXNp b24gMjI1MDU1KQorKysgeXBiaW5kCSh3b3JraW5nIGNvcHkpCkBAIC0yMiw4ICsyMiw3IEBA CiB7CiAJbG9jYWwgX2RvbWFpbgogCi0JaWYgISBjaGVja3llc25vIHJwY2JpbmRfZW5hYmxl ICAmJiBcCi0JICAgICEgL2V0Yy9yYy5kL3JwY2JpbmQgZm9yY2VzdGF0dXMgMT4vZGV2L251 bGwgMj4mMQorCWlmICEgL2V0Yy9yYy5kL3JwY2JpbmQgZm9yY2VzdGF0dXMgMT4vZGV2L251 bGwgMj4mMQogCXRoZW4KIAkJZm9yY2VfZGVwZW5kIHJwY2JpbmQgfHwgcmV0dXJuIDEKIAlm aQpJbmRleDogeXBzZXJ2Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHlwc2VydgkocmV2aXNpb24gMjI1 MDU1KQorKysgeXBzZXJ2CSh3b3JraW5nIGNvcHkpCkBAIC0yMSw4ICsyMSw3IEBACiB7CiAJ bG9jYWwgX2RvbWFpbgogCi0JaWYgISBjaGVja3llc25vIHJwY2JpbmRfZW5hYmxlICAmJiBc Ci0JICAgICEgL2V0Yy9yYy5kL3JwY2JpbmQgZm9yY2VzdGF0dXMgMT4vZGV2L251bGwgMj4m MQorCWlmICEgL2V0Yy9yYy5kL3JwY2JpbmQgZm9yY2VzdGF0dXMgMT4vZGV2L251bGwgMj4m MQogCXRoZW4KIAkJZm9yY2VfZGVwZW5kIHJwY2JpbmQgfHwgcmV0dXJuIDEKIAlmaQpJbmRl eDogeXB4ZnJkCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHlweGZyZAkocmV2aXNpb24gMjI1MDU1KQor KysgeXB4ZnJkCSh3b3JraW5nIGNvcHkpCkBAIC0yMCwxMyArMjAsMTEgQEAKIHsKIAlsb2Nh bCBfZG9tYWluCiAKLQlpZiAhIGNoZWNreWVzbm8gcnBjYmluZF9lbmFibGUgICYmIFwKLQkg ICAgISAvZXRjL3JjLmQvcnBjYmluZCBmb3JjZXN0YXR1cyAxPi9kZXYvbnVsbCAyPiYxCisJ aWYgISAvZXRjL3JjLmQvcnBjYmluZCBmb3JjZXN0YXR1cyAxPi9kZXYvbnVsbCAyPiYxCiAJ dGhlbgogCQlmb3JjZV9kZXBlbmQgcnBjYmluZCB8fCByZXR1cm4gMQogCWZpCi0JaWYgISBj aGVja3llc25vIG5pc19zZXJ2ZXJfZW5hYmxlICYmIFwKLQkgICAgISAvZXRjL3JjLmQveXBz ZXJ2IGZvcmNlc3RhdHVzIDE+L2Rldi9udWxsIDI+JjEKKwlpZiAhIC9ldGMvcmMuZC95cHNl cnYgZm9yY2VzdGF0dXMgMT4vZGV2L251bGwgMj4mMQogCXRoZW4KIAkJZm9yY2VfZGVwZW5k IHlwc2VydiB8fCByZXR1cm4gMQogCWZpCg== --------------040006000003030000080701--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4E50B5E3.90702>