[PATCH] rc.d/vkernel enhancements
--nextPart6361587.G05uGy1Nc0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8Bit
Changes:
- added a vkernel_bin rc.conf var which sets the vkernel binary for all
vkernels that don't specify their own (usually most/all vkernels use the same
binary, so thought this would be useful)
- the root img is no longer required for vkernels (e.g. diskless vkernels)
- stopping vkernels requires a pidfile (it doesn't kill by binary name anymore)
and after a set timeout (vkernel_kill_timeout) it does a SIGKILL if the
vkernel has not shut down properly yet
- when starting a vkernel, do not just check if the pidfile exists, but also if
a process with that pid already exists
- when starting a vkernel, also redirect STDIN due to some strange behaviour
when not redirecting it (e.g. after the vkernel paniced, the arrow keys
stopped functioning ... daemon(8) does not by default redirect STDIN so I
guess the vkernel could still influence the controlling console?)
--
Please do not CC me, since I already receive everything from these MLs.
Regards,
Rumko
--nextPart6361587.G05uGy1Nc0
Content-Type: application/mbox; name="0001-vkernel-rc-improvements.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="0001-vkernel-rc-improvements.patch"
RnJvbSAyYTIxZTY3Mjg5ODQwOGRmZjczYTE2M2I5MTdlMDM4MTkwYmQxODQ0IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBSdW1rbyA8cnVtY2ljQGdtYWlsLmNvbT4KRGF0ZTogU3VuLCAx
MCBPY3QgMjAxMCAxNzoyMDo0MCArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMS8zXSB2a2VybmVsOiBy
YyBpbXByb3ZlbWVudHMKCkFkZCBhIHZrZXJuZWxfYmluIHZhciB0aGF0IGNvbnRhaW5zIHRoZSBk
ZWZhdWx0IHBhdGggdG8gdGhlIGJpbmFyeSwKZm9yIGFsbCB0aGUgdmtlcm5lbHMgd2l0aG91dCBh
IHZrZXJuZWwgc3BlY2lmaWMgZW50cnkuCkFsc28gdGhlIHJvb3QgaW1hZ2UgaXMgbm8gbG9uZ2Vy
IHJlcXVpcmVkIChkaXNrbGVzcyB2a2VybmVscyBoYXZlIG5vCnVzZSBmb3IgYSByb290IGltYWdl
KS4KQW5kIHdoZW4gc3RvcHBpbmcgYSB2a2VybmVsIGEgcGlkZmlsZSBpcyByZXF1aXJlZCBzbyB3
ZSBkb24ndCBraWxsCmlubm9jZW50IGJ5c3RhbmRlcnMuCi0tLQogZXRjL2RlZmF1bHRzL3JjLmNv
bmYgfCAgICAxICsKIGV0Yy9yYy5kL3ZrZXJuZWwgICAgIHwgICAyMCArKysrKysrKy0tLS0tLS0t
LS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoK
ZGlmZiAtLWdpdCBhL2V0Yy9kZWZhdWx0cy9yYy5jb25mIGIvZXRjL2RlZmF1bHRzL3JjLmNvbmYK
aW5kZXggNzliMmRjZC4uNjgzYzRjNiAxMDA2NDQKLS0tIGEvZXRjL2RlZmF1bHRzL3JjLmNvbmYK
KysrIGIvZXRjL2RlZmF1bHRzL3JjLmNvbmYKQEAgLTQ1Nyw2ICs0NTcsNyBAQCBqYWlsX3N5c3Zp
cGNfYWxsb3c9Ik5PIgkjIEFsbG93IFN5c3RlbVYgSVBDIHVzZSBmcm9tIHdpdGhpbiBhIGphaWwK
IAogdmtlcm5lbF9lbmFibGU9Ik5PIgkjIFNldCB0byBZRVMgdG8gZW5hYmxlIHN0YXJ0aW5nIG9m
IHZrZXJuZWxzCiB2a2VybmVsX2xpc3Q9IiIJCSMgU3BhY2Ugc2VwYXJhdGVkIGxpc3Qgb2YgbmFt
ZXMgb2Ygdmtlcm5lbHMKKyN2a2VybmVsX2Jpbj0iL2Jvb3Qva2VybmVsLlZLRVJORUwiCSMgRGVm
YXVsdCBwYXRoIHRvIHRoZSB2a2VybmVsIGJpbmFyeQogCiAjCiAjIENyZWF0ZSBhbiBlbnRyeSBm
b3IgZWFjaCB2a2VybmVsIHNwZWNpZmllZCBpbiB2a2VybmVsX2xpc3QKZGlmZiAtLWdpdCBhL2V0
Yy9yYy5kL3ZrZXJuZWwgYi9ldGMvcmMuZC92a2VybmVsCmluZGV4IGVmMjgxMzMuLjM1YzhhNDMg
MTAwNjQ0Ci0tLSBhL2V0Yy9yYy5kL3ZrZXJuZWwKKysrIGIvZXRjL3JjLmQvdmtlcm5lbApAQCAt
MjcsMTIgKzI3LDE0IEBAIHZrZXJuZWxfc3RhcnQoKQogCQkjIENvbmZpZ3VyZSB2a2VybmVsIGJp
bmFyeQogCQlldmFsIF9iaW49XCJcJHt2a2VybmVsXyR7X3ZrZXJuZWx9X2Jpbn1cIgogCQlpZiBb
IC16ICIke19iaW59IiAtbyAhIC14ICIke19iaW59IiBdOyB0aGVuCi0JCQllY2hvCi0JCQl3YXJu
ICJNaXNzaW5nIG9yIHVuZGVmaW5lZCBiaW5hcnkgZm9yIHZrZXJuZWwgJyR7X3ZrZXJuZWx9Jy4g
U2tpcHBpbmcuIgotCQkJY29udGludWUKLQkJZWxzZQotCQkJYmluPSR7X2Jpbn0KKwkJCWV2YWwg
X2Jpbj1cIlwke3ZrZXJuZWxfYmlufVwiCisJCQlpZiBbIC16ICIke19iaW59IiAtbyAhIC14ICIk
e19iaW59IiBdOyB0aGVuCisJCQkJZWNobworCQkJCXdhcm4gIk1pc3Npbmcgb3IgdW5kZWZpbmVk
IGJpbmFyeSBmb3Igdmtlcm5lbCAnJHtfdmtlcm5lbH0nLiBTa2lwcGluZy4iCisJCQkJY29udGlu
dWUKKwkJCWZpCiAJCWZpCisJCWJpbj0ke19iaW59CiAKIAkJIyBDb25maWd1cmUgdmtlcm5lbCBt
ZW1vcnkKIAkJZXZhbCBfbWVtc2l6ZT1cIlwkdmtlcm5lbF8ke192a2VybmVsfV9tZW1zaXplXCIK
QEAgLTQ4LDggKzUwLDcgQEAgdmtlcm5lbF9zdGFydCgpCiAJCWV2YWwgX3Jvb3RpbWdzPVwiXCR7
dmtlcm5lbF8ke192a2VybmVsfV9yb290aW1nX2xpc3R9XCIKIAkJaWYgWyAteiAiJHtfcm9vdGlt
Z3N9IiBdOyB0aGVuCiAJCQllY2hvCi0JCQl3YXJuICJObyByb290IGltYWdlIGhhcyBiZWVuIGRl
ZmluZWQgZm9yIHZrZXJuZWwgJyR7X3ZrZXJuZWx9Jy4gU2tpcHBpbmcuIgotCQkJY29udGludWUK
KwkJCXdhcm4gIk5vIHJvb3QgaW1hZ2UgaGFzIGJlZW4gZGVmaW5lZCBmb3Igdmtlcm5lbCAnJHtf
dmtlcm5lbH0nLiIKIAkJZWxzZQogCQkJZm9yIF9yb290aW1nIGluICR7X3Jvb3RpbWdzfQogCQkJ
ZG8KQEAgLTg2LDExICs4Nyw2IEBAIHZrZXJuZWxfc3RvcCgpCiAJCWV2YWwgcGlkZmlsZT0iL3Zh
ci9ydW4vdmtlcm5lbC4ke192a2VybmVsfS5waWQiCiAJCWlmIFsgLWYgIiR7cGlkZmlsZX0iIF07
IHRoZW4KIAkJCWV2YWwgcGlkPWBjYXQgJHtwaWRmaWxlfWAKLQkJZWxzZQotCQkJZXZhbCBfYmlu
PVwiXCR7dmtlcm5lbF8ke192a2VybmVsfV9iaW59XCIKLQkJCWlmIFsgLW4gIiRfYmluIiBdOyB0
aGVuCi0JCQkJZXZhbCBwaWQ9YHBzIGF1eHd3dyB8IGdyZXAgJHtfYmlufSB8IGdyZXAgLXYgZ3Jl
cCB8IGF3ayAne3ByaW50ICQyfSdgCi0JCQlmaQogCQlmaQogCQlpZiBbIC16ICIke3BpZH0iIF07
IHRoZW4KIAkJCXdhcm4gInZrZXJuZWwgJyR7X3ZrZXJuZWx9JyBub3QgcnVubmluZz8iCi0tIAox
LjcuMC41Cgo=
--nextPart6361587.G05uGy1Nc0
Content-Type: application/mbox; name="0002-rc.d-completely-stop-the-vkernels.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="0002-rc.d-completely-stop-the-vkernels.patch"
RnJvbSA0NWM2Y2ZlYmRjZjBlZjA5YjQyMmMzNzcxYTg2NmM4YWE3MGE2ZWU5IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBSdW1rbyA8cnVtY2ljQGdtYWlsLmNvbT4KRGF0ZTogU3VuLCAx
MCBPY3QgMjAxMCAxOToxMjozMyArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMi8zXSByYy5kOiBjb21w
bGV0ZWx5IHN0b3AgdGhlIHZrZXJuZWxzCgpXaGVuIHN0b3BwaW5nIHRoZSB2a2VybmVsLCBhZnRl
ciBhIHNldCB0aW1lb3V0IGlmIHRoZSB2a2VybmVsIGlzIHN0aWxsCmFsaXZlLCBzZW5kIGEgU0lH
S0lMTC4KQWxzbyByZWRpcmVjdCBTVERJTiB3aGVuIHN0YXJ0aW5nIHRoZSB2a2VybmVscy4KLS0t
CiBldGMvZGVmYXVsdHMvcmMuY29uZiB8ICAgIDMgKysrCiBldGMvcmMuZC92a2VybmVsICAgICB8
ICAgMjggKysrKysrKysrKysrKysrKysrKysrKysrKy0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyOCBp
bnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2V0Yy9kZWZhdWx0cy9y
Yy5jb25mIGIvZXRjL2RlZmF1bHRzL3JjLmNvbmYKaW5kZXggNjgzYzRjNi4uNTJkNjZjNCAxMDA2
NDQKLS0tIGEvZXRjL2RlZmF1bHRzL3JjLmNvbmYKKysrIGIvZXRjL2RlZmF1bHRzL3JjLmNvbmYK
QEAgLTQ1OCw2ICs0NTgsNyBAQCBqYWlsX3N5c3ZpcGNfYWxsb3c9Ik5PIgkjIEFsbG93IFN5c3Rl
bVYgSVBDIHVzZSBmcm9tIHdpdGhpbiBhIGphaWwKIHZrZXJuZWxfZW5hYmxlPSJOTyIJIyBTZXQg
dG8gWUVTIHRvIGVuYWJsZSBzdGFydGluZyBvZiB2a2VybmVscwogdmtlcm5lbF9saXN0PSIiCQkj
IFNwYWNlIHNlcGFyYXRlZCBsaXN0IG9mIG5hbWVzIG9mIHZrZXJuZWxzCiAjdmtlcm5lbF9iaW49
Ii9ib290L2tlcm5lbC5WS0VSTkVMIgkjIERlZmF1bHQgcGF0aCB0byB0aGUgdmtlcm5lbCBiaW5h
cnkKKyN2a2VybmVsX2tpbGxfdGltZW91dD0iNDUiCSMgRGVmYXVsdCB0aW1lb3V0IGJlZm9yZSBh
IFNJR0tJTEwgaXMgaXNzdWVkCiAKICMKICMgQ3JlYXRlIGFuIGVudHJ5IGZvciBlYWNoIHZrZXJu
ZWwgc3BlY2lmaWVkIGluIHZrZXJuZWxfbGlzdApAQCAtNDc1LDYgKzQ3Niw4IEBAIHZrZXJuZWxf
bGlzdD0iIgkJIyBTcGFjZSBzZXBhcmF0ZWQgbGlzdCBvZiBuYW1lcyBvZiB2a2VybmVscwogCSMg
T3B0aW9uYWw6IHBhdGggdG8gdGhlIGNvbnNvbGUgbG9nIGZpbGUKICN2a2VybmVsX2V4YW1wbGVf
ZmxhZ3M9Ii1VIgogCSMgT3B0aW9uYWw6IGFkaXRpb25hbCBmbGFncyB0byBzdGFydCB0aGUgdmtl
cm5lbCB3aXRoCisjdmtlcm5lbF9leGFtcGxlX2tpbGxfdGltZW91dD0iNDUiCisJIyBPcHRpb25h
bDogdGltZW91dCBiZWZvcmUgU0lHS0lMTCBpcyBpc3N1ZWQgd2hlbiBzdG9wcGluZyB0aGUgdmtl
cm5lbAogCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj
IyMjIyMjIyMjIyMjIwogIyMjIERlZmluZSBzb3VyY2VfcmNfY29uZnMsIHRoZSBtZWNoYW5pc20g
dXNlZCBieSAvZXRjL3JjLiogIyMKZGlmZiAtLWdpdCBhL2V0Yy9yYy5kL3ZrZXJuZWwgYi9ldGMv
cmMuZC92a2VybmVsCmluZGV4IDM1YzhhNDMuLmUzYTAzMTYgMTAwNjQ0Ci0tLSBhL2V0Yy9yYy5k
L3ZrZXJuZWwKKysrIGIvZXRjL3JjLmQvdmtlcm5lbApAQCAtNzQsNyArNzQsNyBAQCB2a2VybmVs
X3N0YXJ0KCkKIAkJIyBDb25maWd1cmUgb3B0aW9uYWwgZmxhZ3MKIAkJZXZhbCBmbGFncz1cIlwk
e3ZrZXJuZWxfJHtfdmtlcm5lbH1fZmxhZ3N9XCIKIAotCQlldmFsICJkYWVtb24gJHtiaW59ICR7
bWVtc2l6ZX0gJHtyb290aW1nc30gJHtpZmFjZXN9ICR7ZmxhZ3N9IC1wICR7cGlkZmlsZX0gPj4k
e2xvZ2ZpbGV9IDI+JjEiCisJCWV2YWwgImRhZW1vbiAke2Jpbn0gJHttZW1zaXplfSAke3Jvb3Rp
bWdzfSAke2lmYWNlc30gJHtmbGFnc30gLXAgJHtwaWRmaWxlfSA+PiR7bG9nZmlsZX0gMj4mMSA8
L2Rldi9udWxsIgogCQllY2hvIC1uICIgJHtfdmtlcm5lbH0iCiAJZG9uZQogCWVjaG8gJy4nCkBA
IC05MCw4ICs5MCwzMCBAQCB2a2VybmVsX3N0b3AoKQogCQlmaQogCQlpZiBbIC16ICIke3BpZH0i
IF07IHRoZW4KIAkJCXdhcm4gInZrZXJuZWwgJyR7X3ZrZXJuZWx9JyBub3QgcnVubmluZz8iCi0J
CWVsc2UKLQkJCWV2YWwga2lsbCAtVEVSTSAke3BpZH0KKwkJCWNvbnRpbnVlCisJCWZpCisJCWV2
YWwga2lsbCAtVEVSTSAke3BpZH0KKworCQlldmFsIF9raWxsX3RpbWVvdXQ9XCJcJHt2a2VybmVs
XyR7X3ZrZXJuZWx9X2tpbGxfdGltZW91dH1cIgorCQlpZiBbIC16ICIke19raWxsX3RpbWVvdXR9
IiBdOyB0aGVuCisJCQlldmFsIF9raWxsX3RpbWVvdXQ9XCJcJHt2a2VybmVsX2tpbGxfdGltZW91
dH1cIgorCQkJaWYgWyAteiAiJHtfa2lsbF90aW1lb3V0fSIgXTsgdGhlbgorCQkJCV9raWxsX3Rp
bWVvdXQ9NjAKKwkJCWZpCisJCWZpCisKKwkJIyBDaGVjayB0aGF0IHRoZSB2a2VybmVsIGVuZGVk
IHByb3Blcmx5CisJCWNudD0xCisJCWV2YWwgdGVtcF9waWQ9YHBzIGF4d3dwICR7cGlkfSB8IGdy
ZXAgLXdFICJeWyBdKyR7cGlkfSIgfCBncmVwIC12IGdyZXAgfCBhd2sgJ3twcmludCAkMX0nYAor
CQl3aGlsZSBbICEgLXogIiR7dGVtcF9waWR9IiAtYSAiJHtjbnR9IiAtbHQgIiR7X2tpbGxfdGlt
ZW91dH0iIF07IGRvCisJCQlldmFsIHRlbXBfcGlkPWBwcyBheHd3cCAke3BpZH0gfCBncmVwIC13
RSAiXlsgXSske3BpZH0iIHwgZ3JlcCAtdiBncmVwIHwgYXdrICd7cHJpbnQgJDF9J2AKKwkJCWNu
dD1gZXhwciAkY250ICsgMWAKKwkJCXNsZWVwIDEKKwkJZG9uZQorCQkKKwkJaWYgWyAhIC16ICIk
e3RlbXBfcGlkfSIgXTsgdGhlbgorCQkJZXZhbCBraWxsIC1LSUxMICR7cGlkfQorCQkJd2FybiAi
JyR7X3ZrZXJuZWx9JyBoYWQgdG8gYmUgZm9yY2VmdWxseSBraWxsZWQuIgogCQlmaQogCWRvbmUK
IH0KLS0gCjEuNy4wLjUKCg==
--nextPart6361587.G05uGy1Nc0
Content-Type: application/mbox; name="0003-rc.d-vkernel-pidfile-related-enhancements.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="0003-rc.d-vkernel-pidfile-related-enhancements.patch"
RnJvbSAxMjhiZjNjNGFhNDAyYTBjMWFiMjU3YmZlZWQzMmJiYTE5ODNjMDNmIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBSdW1rbyA8cnVtY2ljQGdtYWlsLmNvbT4KRGF0ZTogU3VuLCAx
MCBPY3QgMjAxMCAyMDoyMTozNSArMDIwMApTdWJqZWN0OiBbUEFUQ0ggMy8zXSByYy5kL3ZrZXJu
ZWw6IHBpZGZpbGUgcmVsYXRlZCBlbmhhbmNlbWVudHMKCkZpeCBhIHR5cG8gd2hlbiBjaGVja2lu
ZyBmb3IgdGhlIHBpZCBmaWxlIHdoZW4gc3RhcnRpbmcgYSB2a2VybmVsLgpCZXR0ZXIgY2hlY2tp
bmcgaWYgdGhlIHZrZXJuZWwgYmVpbmcgc3RhcnRlZCBpcyBhbHJlYWR5IHJ1bm5pbmcuCi0tLQog
ZXRjL3JjLmQvdmtlcm5lbCB8ICAgMTEgKysrKysrKy0tLS0KIDEgZmlsZXMgY2hhbmdlZCwgNyBp
bnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2V0Yy9yYy5kL3ZrZXJu
ZWwgYi9ldGMvcmMuZC92a2VybmVsCmluZGV4IGUzYTAzMTYuLjQ0NTM3NTYgMTAwNjQ0Ci0tLSBh
L2V0Yy9yYy5kL3ZrZXJuZWwKKysrIGIvZXRjL3JjLmQvdmtlcm5lbApAQCAtMTgsMTAgKzE4LDEz
IEBAIHZrZXJuZWxfc3RhcnQoKQogCWRvCiAJCSMgQ2hlY2sgaWYgYWxyZWFkeSBydW5uaW5nCiAJ
CWV2YWwgcGlkZmlsZT0iL3Zhci9ydW4vdmtlcm5lbC4ke192a2VybmVsfS5waWQiCi0JCWlmIFsg
LWYgIiR7X3BpZGZpbGV9IiBdOyB0aGVuCi0JCQllY2hvCi0JCQl3YXJuICJWa2VybmVsICR7X3Zr
ZXJuZWx9IGFscmVhZHkgcnVubmluZz8gKGNoZWNrICR7cGlkZmlsZX0pIgotCQkJY29udGludWUK
KwkJaWYgWyAtZiAiJHtwaWRmaWxlfSIgXTsgdGhlbgorCQkJZXZhbCBwaWQ9YGNhdCAke3BpZGZp
bGV9YAorCQkJaWYgWyAhIC16ICIke3BpZH0iIC1hICEgLXogImBwcyBheHd3cCAke3BpZH0gfCBn
cmVwIC13RSAiXlsgXSske3BpZH0iIHwgZ3JlcCAtdiBncmVwIHwgYXdrICd7cHJpbnQgJDF9J2Ai
IF07IHRoZW4KKwkJCQllY2hvCisJCQkJd2FybiAiVmtlcm5lbCAke192a2VybmVsfSBhbHJlYWR5
IHJ1bm5pbmc/IChjaGVjayAke3BpZGZpbGV9KSIKKwkJCQljb250aW51ZQorCQkJZmkKIAkJZmkK
IAogCQkjIENvbmZpZ3VyZSB2a2VybmVsIGJpbmFyeQotLSAKMS43LjAuNQoK
--nextPart6361587.G05uGy1Nc0--
討論串 (同標題文章)