Date: Tue, 26 Aug 2014 12:50:15 +0200 From: Stefan Esser <se@freebsd.org> To: "freebsd-hackers@freebsd.org" <freebsd-hackers@freebsd.org> Cc: John-Mark Gurney <jmg@funkthat.com>, =?UTF-8?B?VsOhY2xhdiBaZW1hbg==?= <vhaisman@gmail.com>, Aleksandr Rybalko <ray@ddteam.net> Subject: [PATCH] fixup and warn about syscons keymap file names used with vt Message-ID: <53FC6667.4090403@freebsd.org>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------050704000507080300030303 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit The attached patch implements the following new features to aid with the transition from syscons to vt: 1) Determine whether executed under syscons or vt 2) Display the console type used in log messages 3) Warn about keymap files, that cannot be loaded 4) Suggest a compatible keymap file to use under vt, if a syscons keymap is specified in rc.conf 5) Load the suggested keymap file (may be crucial for systems first booted under vt, if the keymap is to different from the default and the name has not been updated in rc.conf before the reboot) With these patches it should be possible to test vt on a system that is configured for syscons. Please test and report any findings. I want to commit this change to head as soon as possible to make sure it will make it into 10.1 ... Regards, STefan --------------050704000507080300030303 Content-Type: text/plain; charset=windows-1252; name="rc.d_syscons-for-vt.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="rc.d_syscons-for-vt.diff" SW5kZXg6IHN5c2NvbnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3lzY29ucwkoUmV2aXNpb24gMjcw NjQ2KQorKysgc3lzY29ucwkoQXJiZWl0c2tvcGllKQpAQCAtNDUsMTYgKzQ1LDExOCBAQAog a2JkZGV2PS9kZXYvdHR5djAKIHZpZGRldj0vZGV2L3R0eXYwCiAKLV9zY19jb25maWc9InN5 c2NvbnMiCitfc2NfY29uZmlnPQorX3NjX2NvbnNvbGU9CiBfc2NfaW5pdGRvbmU9Citfc2Nf a2V5bWFwX21zZz0KIHNjX2luaXQoKQogewogCWlmIFsgLXogIiR7X3NjX2luaXRkb25lfSIg XTsgdGhlbgorCQlpZiBbIC16ICIke19zY19jb25zb2xlfSIgXTsgdGhlbgorCQkJaWYgWyB4 YHN5c2N0bCAtbiBrZXJuLnZ0eWAgPSB4InZ0IiBdOyB0aGVuCisJCQkJX3NjX2NvbnNvbGU9 InZ0IgorCQkJZWxzZQorCQkJCV9zY19jb25zb2xlPSJzeXNjb25zIgorCQkJZmkKKwkJCV9z Y19jb25maWc9IiR7X3NjX2NvbnNvbGV9IgorCQlmaQogCQllY2hvIC1uICJDb25maWd1cmlu ZyAke19zY19jb25maWd9OiIKIAkJX3NjX2luaXRkb25lPXllcwogCWZpCiB9CiAKKyMgc3lz Y29ucyB0byB2dCBtaWdyYXRpb24gaGVscGVyCitsb29rdXBfa2V5bWFwX2Zvcl92dCgpCit7 CisJa2V5bWFwPWBiYXNlbmFtZSAkMSAua2JkYAorCWNhc2UgJGtleW1hcCBpbgoraHkuYXJt c2NpaS04KQkJCWVjaG8gYW07OworYmUuaXNvLmFjYykJCQllY2hvIGJlLmFjYzs7CitiZS5p c28pCQkJCWVjaG8gYmU7OworYmcuYmRzLmN0cmxjYXBzKQkJZWNobyBiZy5iZHM7OworYmcu cGhvbmV0aWMuY3RybGNhcHMpCQllY2hvIGJnLnBob25ldGljOzsKK2JyMjc1Lmlzby5hY2Mp CQkJZWNobyBicjs7CiticjI3NS4qKQkJCWVjaG8gYnIubm9hY2M7OworYnkuKikJCQkJZWNo byBieTs7Citmcl9DQS5pc28uYWNjKQkJCWVjaG8gY2EtZnI7Oworc3dpc3NnZXJtYW4ubWFj Ym9vay5hY2MpCWVjaG8gY2gubWFjYm9vay5hY2M7Oworc3dpc3NnZXJtYW4uaXNvLmFjYykJ CWVjaG8gY2guYWNjOzsKK3N3aXNzZ2VybWFuLiopCQkJZWNobyBjaDs7Citzd2lzc2ZyZW5j aC5pc28uYWNjKQkJZWNobyBjaC1mci5hY2M7Oworc3dpc3NmcmVuY2guKikJCQllY2hvIGNo LWZyOzsKK2NlLmlzbzIpCQkJZWNobyBjZW50cmFsZXVyb3BlYW4ucXdlcnR5OzsKK2NvbGVt YWsuaXNvMTUuYWNjKQkJZWNobyBjb2xlbWFrLmFjYzs7Citjcy4qfGN6LiopCQkJZWNobyBj ejs7CitnZXJtYW4uaXNvLmFjYykJCQllY2hvIGRlLmFjYzs7CitnZXJtYW4uKikJCQllY2hv IGRlOzsKK2RhbmlzaC5pc28uYWNjKQkJCWVjaG8gZGsuYWNjOzsKK2RhbmlzaC5pc28ubWFj Ym9vaykJCWVjaG8gZGsubWFjYm9vazs7CitkYW5pc2guKikJCQllY2hvIGRrOzsKK2VzdG9u aWFuLiopCQkJZWNobyBlZTs7CitzcGFuaXNoLmR2b3JhaykJCQllY2hvIGVzLmR2b3Jhazs7 CitzcGFuaXNoLmlzbyouYWNjKQkJZWNobyBlcy5hY2M7Oworc3BhbmlzaC5pc28pCQkJZWNo byBlczs7CitmaW5uaXNoLiopCQkJZWNobyBmaTs7Citmci5tYWNib29rLmFjYykJCQllY2hv IGZyLm1hY2Jvb2s7OworZnIuaXNvLmFjYykJCQllY2hvIGZyLmFjYzs7Citmci5pc28pCQkJ CWVjaG8gZnI7OworZWwuaXNvMDcpCQkJZWNobyBncjs7Citnci51czEwMS5hY2MpCQkJZWNo byBnci4xMDEuYWNjOzsKK2hyLmlzbykJCQkJZWNobyBocjs7CitodS5pc28yLjEwMWtleXMp CQllY2hvIGh1LjEwMTs7CitodS5pc28yLjEwMmtleXMpCQllY2hvIGh1LjEwMjs7Citpdy5p c284KQkJCWVjaG8gaWw7OworaWNlbGFuZGljLmlzby5hY2MpCQllY2hvIGlzLmFjYzs7Citp Y2VsYW5kaWMuaXNvKQkJCWVjaG8gaXM7OworaXQuaXNvKQkJCQllY2hvIGl0OzsKK2pwLjEw NngpCQkJZWNobyBqcC5jYXBzY3RybDs7CitqcC4xMDYpCQkJCWVjaG8ganA7OworIz8/IGpw LnBjOTguaXNvKQkJZWNobyBqcC5wYzk4OzsKK2trLnB0MTU0LmlvKQkJCWVjaG8ga3ouaW87 Owora2sucHQxNTQua3N0KQkJCWVjaG8ga3oua3N0OzsKK2xhdGluYW1lcmljYW4uaXNvLmFj YykJCWVjaG8gbGF0aW5hbWVyaWNhbi5hY2M7OworbHQuaXNvNCkJCQllY2hvIGx0OzsKK25v cndlZ2lhbi5pc28pCQkJZWNobyBubzs7Citub3J3ZWdpYW4uZHZvcmFrKQkJZWNobyBuby5k dm9yYWs7OworZHV0Y2guaXNvLmFjYykJCQllY2hvIG5sOzsKK2VlZV9ub3JkaWMpCQkJZWNo byBub3JkaWMuYXN1cy1lZWU7OworcGxfUEwuZHZvcmFrKQkJCWVjaG8gcGwuZHZvcmFrOzsK K3BsX1BMLklTTzg4NTktMikJCWVjaG8gcGw7OworcHQuaXNvLmFjYykJCQllY2hvIHB0LmFj Yzs7CitwdC5pc28pCQkJCWVjaG8gcHQ7OworcnUua29pOC1yLnNoaWZ0KQkJZWNobyBydS5z aGlmdDs7CitydS5rb2k4LXIud2luKQkJCWVjaG8gcnUud2luOzsKK3J1LiopCQkJCWVjaG8g cnU7Oworc3dlZGlzaC4qKQkJCWVjaG8gc2U7Oworc2kuaXNvKQkJCQllY2hvIHNpOzsKK3Nr LmlzbzIpCQkJZWNobyBzazs7Cit0ci5pc285LnEpCQkJZWNobyB0cjs7Cit1YS5rb2k4LXUu c2hpZnQuYWx0KQkJZWNobyB1YS5zaGlmdC5hbHQ7OwordWEuKikJCQkJZWNobyB1YTs7Cit1 ay4qLWN0cmwpCQkJZWNobyB1ay5jYXBzY3RybDs7Cit1ay5kdm9yYWspCQkJZWNobyB1ay5k dm9yYWs7OwordWsuKikJCQkJZWNobyB1azs7Cit1cy5pc28uYWNjKQkJCWVjaG8gdXMuYWNj OzsKK3VzLnBjLWN0cmwpCQkJZWNobyB1cy5jdHJsOzsKK3VzLmlzbykJCQkJZWNobyB1czs7 CisgICAgZXNhYworfQorCitrYmRjb250cm9sX2xvYWRfa2V5bWFwKCkKK3sKKwllcnJtc2c9 YGtiZGNvbnRyb2wgPCAke2tiZGRldn0gLWwgJHtrZXltYXB9IDI+JjFgCisJaWYgWyAtbiAi JHtlcnJtc2d9IiAtYSAiJHtfc2NfY29uc29sZX0iID0gInZ0IiBdOyB0aGVuCisJCV9zY19r ZXltYXBfbXNnPSIke2Vycm1zZ30iCisJCWtleW1hcF92dD1gbG9va3VwX2tleW1hcF9mb3Jf dnQgJHtrZXltYXB9YAorCQlpZiBbIC1uICIke2tleW1hcF92dH0iIF07IHRoZW4KKwkJCWVy cm1zZz1ga2JkY29udHJvbCA8ICR7a2JkZGV2fSAtbCAke2tleW1hcF92dH0gMj4mMWAKKwkJ CWlmIFsgLXogIiR7ZXJybXNnfSIgXTsgdGhlbgorCQkgICAgCQlfc2Nfa2V5bWFwX21zZz0i TmV3IGtleW1hcCBuYW1lOiBJbiAvZXRjL3JjLmNvbmYgcmVwbGFjZSAna2V5bWFwPSR7a2V5 bWFwfScgYnkgJ2tleW1hcD0ke2tleW1hcF92dH0nIgorCQkJZmkKKwkJZmkKKwlmaQorfQor CiAjIGhlbHBlcgogc3lzY29uc19jb25maWd1cmVfa2V5Ym9hcmQoKQogewpAQCAtNjUsNyAr MTY3LDcgQEAKIAkJOzsKIAkqKQogCQlzY19pbml0Ci0JCWVjaG8gLW4gJyBrZXltYXAnOwlr YmRjb250cm9sIDwgJHtrYmRkZXZ9IC1sICR7a2V5bWFwfQorCQllY2hvIC1uICcga2V5bWFw JzsJa2JkY29udHJvbF9sb2FkX2tleW1hcAogCQk7OwogCWVzYWMKIApAQCAtMTM5LDEwICsy NDEsOSBAQAogCSMKIAlpZiBbIC1uICIke19zY19pbml0ZG9uZX0iIF07IHRoZW4KIAkJZWNo byAnLicKLQkJX3NjX2NvbmZpZz0ic3lzY29ucyIKKwkJX3NjX2NvbmZpZz0iJHtfc2NfY29u c29sZX0iCiAJCV9zY19pbml0ZG9uZT0KIAlmaQotCiB9CiAKIHN5c2NvbnNfcHJlY21kKCkK QEAgLTI1Niw2ICszNTcsMTIgQEAKIAlmaQogCiAJWyAtbiAiJHtfc2NfaW5pdGRvbmV9IiBd ICYmIGVjaG8gJy4nCisJaWYgWyAtbiAiJHtfc2Nfa2V5bWFwX21zZ30iIF07IHRoZW4KKwkJ ZWNobworCQllY2hvICJXQVJOSU5HOiIKKwkJZWNobyAiJHtfc2Nfa2V5bWFwX21zZ30uIgor CQllY2hvCisJZmkKIH0KIAogbG9hZF9yY19jb25maWcgJG5hbWUK --------------050704000507080300030303--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53FC6667.4090403>