17338 2008-09-26 00:52:23 +0400 [FR] Перезагружать по <Enter> при обратном отсчете по окончании установки 2011-10-20 13:53:41 +0400 1 1 4 Development Sisyphus installer unstable all Linux CLOSED FIXED http://git.altlinux.org/people/mike/packages/?p=installer.git;a=commitdiff;h=2e4a322f7115f1655a24ccea3d551ba936b9775e usability P2 enhancement --- 1 torabora08 mike aen antohami boyarsh cas klark ldv mike rider sem qa-sisyphus oldest_to_newest 78745 0 torabora08 2008-09-26 00:52:23 +0400 Сделать перезагрузку по <Enter> при обратном отсчете после окончания установки. Было бы комфортно. 105232 1 torabora08 2010-01-08 00:45:41 +0300 Что лично я могу сделать (как пользователь Alt linux) для реализации этого FR? Куда копать/стучаться для того, чтобы сдвинуть решение с мертвой точки? 106941 2 mike 2010-02-20 20:25:59 +0300 http://git.altlinux.org/gears/i/installer.git?p=installer.git;a=blob;f=installer/src/install2-init.c;h=57038cfaee3db0f5d735e87eeace8e1b506ac4d1;hb=HEAD#l133 Можете предложить свои правки к этому файлу, я постараюсь проверить и втащить. 112670 3 4559 torabora08 2010-09-25 03:26:47 +0400 Created attachment 4559 'press any key to reboot' at the end of install 112671 4 torabora08 2010-09-25 03:28:13 +0400 Модифицированный файл, должно работать. Прошу проверить и втащить. 117224 5 4559 mike 2011-01-16 21:33:58 +0300 Comment on attachment 4559 'press any key to reboot' at the end of install Что-то он по размеру сильно отличается от installer/src/install2-init.c -- чем Вы его правили? 117225 6 4761 mike 2011-01-16 21:37:07 +0300 Created attachment 4761 'press any key to reboot' at the end of install patch (untested) diff -uwE выручил, по крайней мере получилось выделить собственно разницу. 117226 7 mike 2011-01-16 21:53:23 +0300 Хм, а это отсюда взято? http://www.gidforums.com/t-19046.html 117227 8 mike 2011-01-16 22:13:43 +0300 Минимально причесал и пушнул сюда: http://git.altlinux.org/people/mike/packages/?p=installer.git;a=shortlog;h=refs/heads/kbhit Просьба подтвердить/указать источник примера. 117228 9 torabora08 2011-01-17 02:14:34 +0300 Да, брал оттуда (http://www.gidforums.com/t-19046.html). Это наиболее прозрачная реализация алгоритма из всех, что нашёл под posix. Чем правил файл уже не помню. Кусок кода тестировал - работает. 121418 10 torabora08 2011-05-19 12:54:58 +0400 Очень хочется, чтобы патч приложился к инсталлеру и попал в бету Кентавра. Как его подтолкнуть? 121485 11 mike 2011-05-20 21:07:25 +0400 Антон, возьми pls -- смотрю, как раз installer.git занялись. Можно у меня cherry-pick 2e4a322f7115f1655a24ccea3d551ba936b9775e -- поверх 1.4.9-alt1 ложится, сборкой инсталера проверено, работает сообразно заявленному. 121774 12 mike 2011-05-31 03:01:25 +0400 Поскольку последние полторы недели движняка в installer.git не наблюдаю и бранч отпочковался -- заливаю исправление (task #46538) и предлагаю его также в p6/t6. 121775 13 repository-robot 2011-05-31 03:07:46 +0400 installer-1.4.10-alt1 -> sisyphus: * Tue May 31 2011 Michael Shigorin <mike@altlinux> 1.4.10-alt1 - terminate countdown at a key press (closes: #17338) 121776 14 cas 2011-05-31 10:51:43 +0400 (В ответ на комментарий №12) > Поскольку последние полторы недели движняка в installer.git не наблюдаю и бранч > отпочковался -- заливаю исправление (task #46538) и предлагаю его также в > p6/t6. Скопировал из Сизифа в p6. 126377 15 mike 2011-10-20 13:53:41 +0400 (прогоняя очередной цикл) Тёзка, как я Вам благодарен за этот патчик и за терпение, с которым Вы добивались его тестирования и вхождения! 4559 2010-09-25 03:26:47 +0400 2011-01-16 21:37:07 +0300 'press any key to reboot' at the end of install install2-init_press_key_reboot.c text/plain 12440 torabora08 I2RlZmluZSBfR05VX1NPVVJDRQ0KICAgIA0KICAgICNpbmNsdWRlIDxzdGRpby5oPg0KICAgICNp bmNsdWRlIDxzdGRsaWIuaD4NCiAgICAjaW5jbHVkZSA8c3RyaW5nLmg+DQogICAgI2luY2x1ZGUg PHVuaXN0ZC5oPg0KICAgICNpbmNsdWRlIDxzaWduYWwuaD4NCiAgICAjaW5jbHVkZSA8dGltZS5o Pg0KICAgICNpbmNsdWRlIDxmY250bC5oPg0KICAgI2luY2x1ZGUgPG1udGVudC5oPg0KICAgI2lu Y2x1ZGUgPHRlcm1pb3MuaD4NCiAgIA0KICAgI2luY2x1ZGUgPHN5cy9yZWJvb3QuaD4NCiAgICNp bmNsdWRlIDxzeXMvbW91bnQuaD4NCiAgICNpbmNsdWRlIDxzeXMvc3RhdC5oPg0KICAgI2luY2x1 ZGUgPHN5cy90eXBlcy5oPg0KICAgI2luY2x1ZGUgPHN5cy93YWl0Lmg+DQogICAjaW5jbHVkZSA8 c3lzL3N5c2NhbGwuaD4NCiAgICNpbmNsdWRlIDxzeXMvc3lzbWFjcm9zLmg+DQogICAjaW5jbHVk ZSA8c3lzL2lvY3RsLmg+DQogICANCiAgICNpbmNsdWRlIDxsaW51eC9yZWJvb3QuaD4NCiAgICNp bmNsdWRlIDxsaW51eC9sb29wLmg+DQogICANCiAgICNpbmNsdWRlIDxlcnJuby5oPg0KICAgI2lu Y2x1ZGUgPGVycm9yLmg+DQogICANCiAgIC8qIFNldCBhIHNpZ25hbCBoYW5kbGVyLiAqLw0KICAg I2RlZmluZSBTRVRTSUcoc2EsIHNpZywgZnVuLCBmbGFncykgXA0KICAgICAgICAgICAgICAgICAg IGRvIHsgXA0KICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Euc2FfaGFuZGxlciA9IGZ1bjsg XA0KICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Euc2FfZmxhZ3MgPSBmbGFnczsgXA0KICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2lnZW1wdHlzZXQoJnNhLnNhX21hc2spOyBcDQogICAg ICAgICAgICAgICAgICAgICAgICAgICBzaWdhY3Rpb24oc2lnLCAmc2EsIE5VTEwpOyBcDQogICAg ICAgICAgICAgICAgICAgfSB3aGlsZSgwKQ0KICAgDQogICAjZGVmaW5lIFJFQk9PVF9USU1FT1VU IDIwDQogICAjZGVmaW5lIEVDSElMRF9USU1FT1VUIDUNCiAgIA0KICAgY29uc3QgY2hhciAqaW5z dGFsbF9wcm9nW10gPSB7ICIvdXNyL3NiaW4vaW5zdGFsbDIiLCAoY2hhciAqKSAwIH07DQogICBj b25zdCBjaGFyICpzaGVsbF9wcm9nW10gPSB7ICIvYmluL3NoIiwgKGNoYXIgKikgMCB9Ow0KICAg DQogICBzdGF0aWMgc2lnX2F0b21pY190IGdvdF9FQ0hJTEQ7DQogICANCiAgIHN0YXRpYyB2b2lk DQogICBjaGxkX2hhbmRsZXIoaW50IHNpZyBfX2F0dHJpYnV0ZV9fICgoX191bnVzZWRfXykpKQ0K ICAgew0KICAgICAgICAgICBpbnQgICAgIHJjLCBzdGF0dXM7DQogICAgICAgICAgIGludCAgICAg c2F2ZWRfZXJybm8gPSBlcnJubzsNCiAgIA0KICAgICAgICAgICB3aGlsZSAoKHJjID0gd2FpdHBp ZCgtMSwgJnN0YXR1cywgV05PSEFORykpKQ0KICAgICAgICAgICB7DQogICAgICAgICAgICAgICAg ICAgaWYgKHJjIDwgMCAmJiBlcnJubyA9PSBFQ0hJTEQpDQogICAgICAgICAgICAgICAgICAgew0K ICAgICAgICAgICAgICAgICAgICAgICAgICAgZ290X0VDSElMRCA9IDE7DQogICAgICAgICAgICAg ICAgICAgICAgICAgICBicmVhazsNCiAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgIH0N CiAgIA0KICAgICAgICAgICBlcnJubyA9IHNhdmVkX2Vycm5vOw0KICAgfQ0KICAgDQogICBzdGF0 aWMgIHBpZF90DQogICBydW4oY29uc3QgY2hhciAqY21kW10pDQogICB7DQogICAgICAgICAgIGNv bnN0IGNoYXIgKmV4ZSA9IGNtZFswXTsNCiAgICAgICAgICAgcGlkX3QgICBwaWQ7DQogICANCiAg ICNpZmRlZiBERUJVRw0KICAgICAgICAgICBlcnJvcigwLCAwLCAiRXhlY3V0aW5nICVzIiwgZXhl KTsNCiAgICNlbmRpZg0KICAgICAgICAgICBpZiAoKHBpZCA9IGZvcmsoKSkgPT0gLTEpDQogICAg ICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICBlcnJvcigwLCBlcnJubywgImZvcmsiKTsNCiAg ICAgICAgICAgICAgICAgICByZXR1cm4gLTE7DQogICAgICAgICAgIH0NCiAgICAgICAgICAgaWYg KHBpZCA9PSAwKQ0KICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgZXhlY3YoZXhlLCAo Y2hhciAqY29uc3QgKikgY21kKTsNCiAgICAgICAgICAgICAgICAgICBlcnJvcigwLCBlcnJubywg IiVzOiBleGVjdjoiLCBleGUpOw0KICAgICAgICAgICAgICAgICAgIF9leGl0KEVYSVRfRkFJTFVS RSk7DQogICAgICAgICAgIH0NCiAgICAgICAgICAgcmV0dXJuIHBpZDsNCiAgIH0NCiAgIA0KICAg c3RhdGljIGludA0KICAgcnVuX3dhaXQoY29uc3QgY2hhciAqcHJvZ1tdKQ0KICAgew0KICAgICAg ICAgICBpbnQgICAgIHN0YXR1cyA9IDA7DQogICAgICAgICAgIHBpZF90ICAgcGlkID0gcnVuKHBy b2cpOw0KICAgDQogICAgICAgICAgIGlmIChwaWQgPT0gLTEpDQogICAgICAgICAgICAgICAgICAg cmV0dXJuIEVYSVRfRkFJTFVSRTsNCiAgIA0KICAgICAgICAgICBpZiAod2FpdHBpZChwaWQsICZz dGF0dXMsIDApID09IC0xKQ0KICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgZXJyb3Io MCwgZXJybm8sICJ3YWl0cGlkIik7DQogICAgICAgICAgICAgICAgICAgcmV0dXJuIEVYSVRfRkFJ TFVSRTsNCiAgICAgICAgICAgfQ0KICAgDQogICAgICAgICAgaWYgKCFzdGF0dXMpDQogICAgICAg ICAgICAgICAgICByZXR1cm4gRVhJVF9TVUNDRVNTOw0KICANCiAgICAgICAgICBpZiAoV0lGRVhJ VEVEKHN0YXR1cykpDQogICAgICAgICAgICAgICAgICBlcnJvcigwLCAwLCAiJXM6IHRlcm1pbmF0 ZWQgd2l0aCBleGl0IGNvZGUgJWQiLA0KICAgICAgICAgICAgICAgICAgICAgICAgcHJvZ1swXSwg V0VYSVRTVEFUVVMoc3RhdHVzKSk7DQogICAgICAgICAgZWxzZSBpZiAoV0lGU0lHTkFMRUQoc3Rh dHVzKSkNCiAgICAgICAgICAgICAgICAgIGVycm9yKDAsIDAsICIlczogdGVybWluYXRlZCBieSBz aWduYWwgJWQiLA0KICAgICAgICAgICAgICAgICAgICAgICAgcHJvZ1swXSwgV0VYSVRTVEFUVVMo c3RhdHVzKSk7DQogICAgICAgICAgZWxzZQ0KICAgICAgICAgICAgICAgICAgZXJyb3IoMCwgMCwg IiVzOiB0ZXJtaW5hdGVkLCBzdGF0dXM9JWQiLCBwcm9nWzBdLCBzdGF0dXMpOw0KICANCiAgICAg ICAgICByZXR1cm4gRVhJVF9GQUlMVVJFOw0KICB9DQogIA0KICBzdGF0aWMgaW50DQogIGlzX2Nk cm9tX21ldGhvZCh2b2lkKQ0KICB7DQogICAgICAgICAgY29uc3QgY2hhciAqbWV0aG9kID0gZ2V0 ZW52KCJNRVRIT0QiKTsNCiAgDQogICAgICAgICAgcmV0dXJuIG1ldGhvZCAmJiAhc3RyY21wKG1l dGhvZCwgImNkcm9tIik7DQogIH0NCiAgDQogc3RhdGljIHZvaWQNCiAgcnNsZWVwKHVuc2lnbmVk IGludCBzZWMpDQogIHsNCiAgICAgICAgICBzdHJ1Y3QgdGltZXNwZWMgcmVxID0geyBzZWMsIDAg fSwgcmVtOw0KICANCiAgICAgICAgICBmb3IgKDsgKHJlcS50dl9zZWMgfHwgcmVxLnR2X25zZWMp ICYmICFnb3RfRUNISUxEOyByZXEgPSByZW0pDQogICAgICAgICAgICAgICAgICBpZiAoIW5hbm9z bGVlcCgmcmVxLCAmcmVtKSkNCiAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7DQogIH0N CiAgDQogIGludCANCiAgbGludXhfa2JoaXQodm9pZCkNCiAgew0KICAgIHN0cnVjdCB0ZXJtaW9z IG9sZHN0dWZmOw0KICAgIHN0cnVjdCB0ZXJtaW9zIG5ld3N0dWZmOw0KICAgIHN0cnVjdCB0aW1l dmFsIHR2ID0gezAsMX07IC8qIHNldCBvbmUgbWljcm9zZWNvbmQgdGltZW91dCAqLw0KICAgIGZk X3NldCByZGZkczsNCiAgICBpbnQgZmQgPSBmaWxlbm8oc3RkaW4pOyAgICAvKiBpcyB1c3VhbGx5 IHplcm8gICAgICAgICAgICAgKi8NCiAgICBpbnQgcmV0dmFsOw0KDQogICAgRkRfWkVSTygmcmRm ZHMpOw0KICAgIEZEX1NFVChmZCwgJnJkZmRzKTsNCg0KICAgIHRjZ2V0YXR0cihmZCwgJm9sZHN0 dWZmKTsNCiAgICBuZXdzdHVmZiA9IG9sZHN0dWZmOyAgICAgICAgICAgICAgICAgLyogc2F2ZSBv bGQgYXR0cmlidXRlcyAgICAgICAgICAqLw0KDQogICAgbmV3c3R1ZmYuY19sZmxhZyAmPSB+KElD QU5PTiB8IEVDSE8gfCBJR05CUkspOw0KDQogICAgdGNzZXRhdHRyKGZkLCBUQ1NBTk9XLCAmbmV3 c3R1ZmYpOyAgIC8qIHNldCBuZXcgYXR0cmlidXRlcyAgICAgICAgICAgKi8NCg0KICAgIGlmIChz ZWxlY3QoZmQgKyAxLCAmcmRmZHMsIE5VTEwsIE5VTEwsICZ0dikgPT0gLTEpIHsNCiAgICAgICAg cGVycm9yKCJzZWxlY3QiKTsNCiAgICAgICAgZXhpdCgxKTsNCiAgICB9DQogICAgaWYgKEZEX0lT U0VUKGZkLCAmcmRmZHMpKSB7DQogICAgICAgIHJldHZhbCA9IDE7DQogICAgfQ0KICAgIGVsc2Ug ew0KICAgICAgICByZXR2YWwgPSAwOw0KICAgIH0NCg0KICAgIHRjc2V0YXR0cihmZCwgVENTQU5P VywgJm9sZHN0dWZmKTsgICAvKiByZXN0b3JlIG9sZCBhdHRyaWJ1dGVzICAgICAgICovDQoNCiAg ICByZXR1cm4gcmV0dmFsOw0KICB9DQogIA0KICBzdGF0aWMgdm9pZA0KICBjb3VudGRvd24odm9p ZCkNCiAgew0KICAgICAgICAgIGludCAgICAgaTsNCiAgDQogICAgICAgICBmcHJpbnRmKHN0ZGVy ciwgIiVzIiwgIlxuWW91IG1heSBzYWZlbHkgcmVib290IHlvdXIgc3lzdGVtXG4iKTsNCgkgZnBy aW50ZihzdGRlcnIsICIlcyIsICJQcmVzcyBhbnkga2V5IHRvIHJlYm9vdFxuIik7DQogICAgICAg ICAgZmZsdXNoKHN0ZGVycik7DQogIA0KICAgICAgICAgIC8qIFNldCBjb3VudGRvd24gd2hlbiBN RVRIT0QgPSBjZHJvbSAqLw0KICAgICAgICAgIGlmIChpc19jZHJvbV9tZXRob2QoKSkNCiAgICAg ICAgICB7DQogICAgICAgICAgICAgICAgICBmb3IgKGkgPSBSRUJPT1RfVElNRU9VVDsgaSA+IDA7 IC0taSkNCiAgICAgICAgICAgICAgICAgIHsNCgkJICAgIGlmIChsaW51eF9rYmhpdCgpKQ0KCQkg ICAgICBicmVhazsNCgkJICAgIA0KICAgICAgICAgICAgICAgICAgICAgICAgICBmcHJpbnRmKHN0 ZGVyciwNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiXHJBdXRvbWF0aWMgcmVi b290IGFmdGVyICVkIHNlY29uZHMuLi4gIiwgaSk7DQogICAgICAgICAgICAgICAgICAgICAgICAg IGZmbHVzaChzdGRlcnIpOw0KICAgICAgICAgICAgICAgICAgICAgICAgICBzbGVlcCgxKTsNCiAg ICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICB9DQogICAgICAgICAgZnByaW50ZihzdGRlcnIs ICJcclwwMzNbSyVzXG4iLCAiQXV0b21hdGljIHJlYm9vdCBpbiBwcm9ncmVzcy4iKTsNCiAgICAg ICAgIGZmbHVzaChzdGRlcnIpOw0KIH0NCg0KDQogIA0KICBzdGF0aWMgdm9pZA0KIGtpbGxhbGwo dm9pZCkNCiAgew0KICAgICAgICAgIGludCAgICAgaTsNCiAgDQogICAgICAgICAgZ290X0VDSElM RCA9IDA7DQogICAgICAgICAgZnByaW50ZihzdGRlcnIsICJBc2tpbmcgYWxsIHJlbWFpbmluZyBw cm9jZXNzZXMgdG8gdGVybWluYXRlXG4iKTsNCiAgICAgICAgICAodm9pZCkga2lsbCgtMSwgU0lH VEVSTSk7DQogICAgICAgICAgcnNsZWVwKDEpOw0KICANCiAgICAgICAgICBmcHJpbnRmKHN0ZGVy ciwgIktpbGxpbmcgYWxsIHJlbWFpbmluZyBwcm9jZXNzZXMiKTsNCiAgICAgICAgICAodm9pZCkg a2lsbCgtMSwgU0lHS0lMTCk7DQogICAgICAgICAgY2hsZF9oYW5kbGVyKDApOw0KICANCiAgICAg ICAgICBmb3IgKGkgPSAwOyBpIDwgRUNISUxEX1RJTUVPVVQgJiYgIWdvdF9FQ0hJTEQ7ICsraSkN CiAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICByc2xlZXAoMSk7DQogICAgICAgICAgICAg ICAgICBmcHV0YygnLicsIHN0ZGVycik7DQogICAgICAgICAgfQ0KICAgICAgICAgIGZwdXRjKCdc bicsIHN0ZGVycik7DQogIH0NCiAgDQogIHN0YXRpYyB2b2lkIF9fYXR0cmlidXRlX18gKChub3Jl dHVybikpIHN5c3JlYm9vdCh2b2lkKQ0KICB7DQogICAgICAgICAgY291bnRkb3duKCk7DQogDQog ICAgICAgICBpZiAoKHJlYm9vdChMSU5VWF9SRUJPT1RfQ01EX1JFU1RBUlQpKSA9PSAtMSkNCiAg ICAgICAgICAgICAgICAgIGVycm9yKEVYSVRfRkFJTFVSRSwgZXJybm8sICJyZWJvb3QiKTsNCiAg DQogICAgICAgICAgZm9yICg7OykgcGF1c2UoKTsNCiAgfQ0KICANCiAgc3RhdGljIHZvaWQNCiAg bW91bnRfZnModm9pZCkNCiAgew0KICAgICAgICAgIGlmIChtb3VudCgicHJvYyIsICIvcHJvYyIs ICJwcm9jIiwgMFVMLCBOVUxMKSB8fA0KICAgICAgICAgICAgICBtb3VudCgic3lzZnMiLCAiL3N5 cyIsICJzeXNmcyIsIDBVTCwgTlVMTCkgfHwNCiAgICAgICAgICAgICAgbW91bnQoInRtcGZzIiwg Ii90bXAiLCAidG1wZnMiLCAwVUwsIE5VTEwpIHx8DQogICAgICAgICAgICAgIG1vdW50KCJ0bXBm cyIsICIvbW50IiwgInRtcGZzIiwgMFVMLCBOVUxMKSB8fA0KICAgICAgICAgICAgICBta2Rpcigi L21udC9kZXN0aW5hdGlvbiIsIDA3MDApKQ0KICAgICAgICAgICAgICAgICAgZXJyb3IoRVhJVF9G QUlMVVJFLCBlcnJubywgIm1vdW50IGZhaWxlZCIpOw0KICB9DQogIA0KICBzdGF0aWMgaW50DQog IHVtb3VudF9vbmNlKHZvaWQpDQogIHsNCiAgICAgICAgIGludCAgICAgdW5tb3VudGVkID0gMDsN CiAgICAgICAgIEZJTEUgICAqZjsNCiAgICAgICAgICBzdHJ1Y3QgbW50ZW50ICplOw0KICANCiAg ICAgICAgICBpZiAoIShmID0gZm9wZW4oIi9wcm9jL21vdW50cyIsICJyIikpKQ0KICAgICAgICAg ICAgICAgICAgcmV0dXJuIDA7DQogIA0KICAgICAgICAgIHdoaWxlICgoZSA9IGdldG1udGVudChm KSkpDQogICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgaWYgKCFzdHJjbXAoZS0+bW50X2Rp ciwgIi8iKSkNCiAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWU7DQogIA0KICAgICAg ICAgICAgICAgICAgaWYgKCF1bW91bnQyKGUtPm1udF9kaXIsIDApKQ0KICAgICAgICAgICAgICAg ICAgew0KICAgICAgICAgICAgICAgICAgICAgICAgICArK3VubW91bnRlZDsNCiAgICAgICAgICAg ICAgICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJVbm1vdW50ZWQ6ICVzXG4iLCBlLT5tbnRf ZGlyKTsNCiAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7DQogICAgICAgICAgICAgICAg ICB9DQogICAgICAgICAgfQ0KICANCiAgICAgICAgICBmY2xvc2UoZik7DQogICAgICAgICAgcmV0 dXJuIHVubW91bnRlZDsNCiAgfQ0KICANCiAgc3RhdGljIHZvaWQNCiAgbGlzdF9tb3VudGVkKHZv aWQpDQogIHsNCiAgICAgICAgICBGSUxFICAgKmY7DQogICAgICAgICAgc3RydWN0IG1udGVudCAq ZTsNCiAgDQogICAgICAgICAgaWYgKCEoZiA9IGZvcGVuKCIvcHJvYy9tb3VudHMiLCAiciIpKSkN CiAgICAgICAgICAgICAgICAgIHJldHVybjsNCiAgDQogICAgICAgICAgd2hpbGUgKChlID0gZ2V0 bW50ZW50KGYpKSkNCiAgICAgICAgICAgICAgICAgIGlmIChzdHJjbXAoZS0+bW50X2RpciwgIi8i KSkNCiAgICAgICAgICAgICAgICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJSZW1haW5zIG1v dW50ZWQ6ICVzXG4iLCBlLT5tbnRfZGlyKTsNCiAgDQogICAgICAgICAgZmNsb3NlKGYpOw0KICB9 DQogIA0KICBzdGF0aWMgdm9pZA0KICB1bW91bnRfZnModm9pZCkNCiAgew0KICAgICAgICAgIHdo aWxlICh1bW91bnRfb25jZSgpKQ0KICAgICAgICAgICAgICAgICAgOw0KICB9DQogIA0KICBzdGF0 aWMgdm9pZA0KICBsb29wX2NoYW5nZV9mZChjb25zdCBjaGFyICpkZXZpY2VfcGF0aCwgY29uc3Qg Y2hhciAqc3RvcmFnZV9wYXRoKQ0KICB7DQogICAgICAgICAgaW50ICAgICBkZXZpY2VfZmQgPSAt MTsNCiAgICAgICAgICBpbnQgICAgIHN0b3JhZ2VfZmQgPSAtMTsNCiAgDQogICAgICAgICAgZG8N CiAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICBpZiAoKGRldmljZV9mZCA9IG9wZW4oZGV2 aWNlX3BhdGgsIE9fUkRPTkxZKSkgPCAwKQ0KICAgICAgICAgICAgICAgICAgew0KICAgICAgICAg ICAgICAgICAgICAgICAgICBlcnJvcigwLCBlcnJubywgIm9wZW46ICVzIiwgZGV2aWNlX3BhdGgp Ow0KICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsNCiAgICAgICAgICAgICAgICAgIH0N CiAgDQogICAgICAgICAgICAgICAgICBpZiAoKHN0b3JhZ2VfZmQgPSBvcGVuKHN0b3JhZ2VfcGF0 aCwgT19SRE9OTFkpKSA8IDApDQogICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAg ICAgICAgICAgIGVycm9yKDAsIGVycm5vLCAib3BlbjogJXMiLCBzdG9yYWdlX3BhdGgpOw0KICAg ICAgICAgICAgICAgICAgICAgICAgICBicmVhazsNCiAgICAgICAgICAgICAgICAgIH0NCiAgDQog ICAgICAgICAgICAgICAgICBpZiAoaW9jdGwoZGV2aWNlX2ZkLCAodW5zaWduZWQgbG9uZyBpbnQp IExPT1BfQ0hBTkdFX0ZELA0KICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0b3JhZ2VfZmQp IDwgMCkNCiAgICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3IoMCwgZXJybm8sICJpb2N0bDog TE9PUF9DSEFOR0VfRkQiKTsNCiAgICAgICAgICB9IHdoaWxlICgwKTsNCiAgDQogICAgICAgICAg Y2xvc2UoZGV2aWNlX2ZkKTsNCiAgICAgICAgICBjbG9zZShzdG9yYWdlX2ZkKTsNCiAgfQ0KICAN CiAgc3RhdGljIGludA0KICBjb3B5X2ZpbGUoY29uc3QgY2hhciAqc3JjLCBjb25zdCBjaGFyICpk c3QpDQogIHsNCiAgICAgICAgICBjaGFyICAgIHJidWZbQlVGU0laXTsNCiAgICAgICAgICBjaGFy ICAgKndidWY7DQogICAgICAgICAgaW50ICAgICBpZmQgPSAtMSwgb2ZkID0gLTEsIHJjID0gLTE7 DQogICAgICAgICAgc3NpemVfdCBybGVuLCB3bGVuOw0KICANCiAgICAgICAgICBpZiAoKGlmZCA9 IG9wZW4oc3JjLCBPX1JET05MWSkpIDwgMCkNCiAgICAgICAgICB7DQogICAgICAgICAgICAgICAg ICBlcnJvcigwLCBlcnJubywgIm9wZW46ICVzIiwgc3JjKTsNCiAgICAgICAgICAgICAgICAgIGdv dG8gY29weV9maWxlX2V4aXQ7DQogICAgICAgICAgfQ0KICAgICAgICAgIGlmICgob2ZkID0gb3Bl bihkc3QsIE9fQ1JFQVQgfCBPX1dST05MWSwgMDc1NSkpIDwgMCkNCiAgICAgICAgICB7DQogICAg ICAgICAgICAgICAgICBlcnJvcigwLCBlcnJubywgIm9wZW46ICVzIiwgZHN0KTsNCiAgICAgICAg ICAgICAgICAgIGdvdG8gY29weV9maWxlX2V4aXQ7DQogICAgICAgICAgfQ0KICANCiAgICAgICAg ICB3aGlsZSAoKHJsZW4gPSBURU1QX0ZBSUxVUkVfUkVUUlkocmVhZChpZmQsIHJidWYsIHNpemVv ZiByYnVmKSkpID4gMCkNCiAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICB3bGVuID0gcmxl bjsNCiAgICAgICAgICAgICAgICAgIHdidWYgPSByYnVmOw0KICANCiAgICAgICAgICAgICAgICAg IHdoaWxlICh3bGVuID4gMCkNCiAgICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAg ICAgICAgICAgc3NpemVfdCBsZW47DQogIA0KICAgICAgICAgICAgICAgICAgICAgICAgICBsZW4g PSBURU1QX0ZBSUxVUkVfUkVUUlkod3JpdGUob2ZkLCB3YnVmLCAoc2l6ZV90KSB3bGVuKSk7DQog ICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChsZW4gPCAwKQ0KICAgICAgICAgICAgICAgICAg ICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3IoMCwgZXJy bm8sICJ3cml0ZTogJXMiLCBkc3QpOw0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGdvdG8gY29weV9maWxlX2V4aXQ7DQogICAgICAgICAgICAgICAgICAgICAgICAgIH0NCiAgICAg ICAgICAgICAgICAgICAgICAgICAgd2xlbiAtPSBsZW47DQogICAgICAgICAgICAgICAgICAgICAg ICAgIHdidWYgKz0gbGVuOw0KICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgIH0NCiAgICAg ICAgICBpZiAocmxlbiA8IDApDQogICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgZXJyb3Io MCwgZXJybm8sICJyZWFkOiAlcyIsIHNyYyk7DQogICAgICAgICAgICAgICAgICBnb3RvIGNvcHlf ZmlsZV9leGl0Ow0KICAgICAgICAgIH0NCiAgDQogICAgICAgICAgaWYgKGZjaG1vZChvZmQsIDA1 MDApKQ0KICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgIGVycm9yKDAsIGVycm5vLCAiZmNo bW9kOiAlcyIsIGRzdCk7DQogICAgICAgICAgICAgICAgICBnb3RvIGNvcHlfZmlsZV9leGl0Ow0K ICAgICAgICAgfQ0KICANCiAgICAgICAgICByYyA9IDA7DQogICAgICAgIGNvcHlfZmlsZV9leGl0 Og0KICAgICAgICAgIGNsb3NlKG9mZCk7DQogICAgICAgICAgY2xvc2UoaWZkKTsNCiAgICAgICAg ICByZXR1cm4gcmM7DQogIH0NCiAgDQogIHN0YXRpYyB2b2lkDQogIHJlZXhlY19zZWxmKGNvbnN0 IGNoYXIgKnBhdGgpDQogIHsNCiAgICAgICAgICBjb25zdCBjaGFyICphcmdzW10gPSB7IHBhdGgs IChjb25zdCBjaGFyICopIDAgfTsNCiAgDQogICAgICAgICAgaWYgKGNvcHlfZmlsZSgiL3Byb2Mv c2VsZi9leGUiLCBwYXRoKSkNCiAgICAgICAgICAgICAgICAgIHJldHVybjsNCiAgICAgICAgICBp ZiAoZXhlY3YocGF0aCwgKGNoYXIgKmNvbnN0ICopIGFyZ3MpKQ0KICAgICAgICAgICAgICAgICAg ZXJyb3IoMCwgZXJybm8sICJleGVjdjogJXMiLCBwYXRoKTsNCiAgfQ0KICANCiAgc3RhdGljIHZv aWQNCiAgZG9faW5zdGFsbChjb25zdCBjaGFyICpwYXRoKQ0KICB7DQogICAgICAgICAgaW50ICAg ICBydW5fc2hlbGw7DQogIA0KICAjaWZkZWYgREVCVUcNCiAgICAgICAgICBydW5fc2hlbGwgPSAx Ow0KICAjZWxzZQ0KICAgICAgICAgIHJ1bl9zaGVsbCA9IDA7DQogICNlbmRpZg0KICAgICAgICAg IG1vdW50X2ZzKCk7DQogIA0KICAgICAgICAgIGlmIChydW5fd2FpdChpbnN0YWxsX3Byb2cpKQ0K ICAgICAgICAgICAgICAgICAgcnVuX3NoZWxsID0gMTsNCiAgDQogICAgICAgICAgaWYgKHJ1bl9z aGVsbCkNCiAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwNCiAg ICAgICAgICAgICAgICAgICAgICAgICAgIlRoaXMgc2hlbGwgcmVtYWlucyBoZXJlIGZvciBkZWJ1 ZyBwdXJwb3Nlcy4gIFByZXNzIEN0cmwtRCB0byBleGl0LlxuIik7DQogICAgICAgICAgICAgICAg ICAodm9pZCkgcnVuX3dhaXQoc2hlbGxfcHJvZyk7DQogICAgICAgICAgfQ0KICANCiAgICAgICAg ICBraWxsYWxsKCk7DQogICAgICAgICAgcmVleGVjX3NlbGYocGF0aCk7DQogIH0NCiAgDQogIHN0 YXRpYyB2b2lkDQogIG1vdmVfZnMoY29uc3QgY2hhciAqc3JjLCBjb25zdCBjaGFyICpkc3QpDQog IHsNCiAgICAgICAgICBpZiAobWtkaXIoZHN0LCAwNzAwKSB8fCBtb3VudChzcmMsIGRzdCwgTlVM TCwgTVNfTU9WRSwgTlVMTCkpDQogICAgICAgICAgICAgICAgICBlcnJvcigwLCBlcnJubywgIm1v dmVfZnM6ICVzIC0+ICVzIiwgc3JjLCBkc3QpOw0KICB9DQogIA0KICAjZGVmaW5lIHBpdm90X3Jv b3QobmV3X3Jvb3QscHV0X29sZCkgc3lzY2FsbChTWVNfcGl2b3Rfcm9vdCxuZXdfcm9vdCxwdXRf b2xkKQ0KIA0KIHN0YXRpYyB2b2lkDQogIHN3aXRjaF9yb290KHZvaWQpDQogIHsNCiAgICAgICAg ICBjb25zdCBjaGFyICpvbGRfcm9vdCA9ICIvbW50L29sZHJvb3QiOw0KICANCiAgICAgICAgICBt b3ZlX2ZzKCIvcHJvYyIsICIvbW50L3Byb2MiKTsNCiAgICAgICAgICBtb3ZlX2ZzKCIvc3lzIiwg Ii9tbnQvc3lzIik7DQogICAgICAgICAgbW92ZV9mcygiL2RldiIsICIvbW50L2RldiIpOw0KICAg ICAgICAgIGlmIChta2RpcihvbGRfcm9vdCwgMDcwMCkgfHwNCiAgICAgICAgICAgICAgcGl2b3Rf cm9vdCgiL21udCIsIG9sZF9yb290KSB8fCBjaGRpcigiLyIpKQ0KICAgICAgICAgICAgICAgICAg ZXJyb3IoMCwgZXJybm8sICJzd2l0Y2hfcm9vdCIpOw0KICB9DQogIA0KICBpbnQNCiAgbWFpbihp bnQgYWMsIGNvbnN0IGNoYXIgKmF2W10pDQogIHsNCiAgICAgICAgICBjb25zdCBjaGFyICp0bXBf aW5pdCA9ICIvbW50L2luaXQiOw0KICAgICAgICAgIHN0cnVjdCBzaWdhY3Rpb24gc2E7DQogIA0K ICAgICAgICAgIGlmIChnZXRldWlkKCkgIT0gMCkNCiAgICAgICAgICAgICAgICAgIGVycm9yKEVY SVRfRkFJTFVSRSwgRVBFUk0sICJpbml0Iik7DQogIA0KICAgICAgICAgIFNFVFNJRyhzYSwgU0lH SU5ULCBTSUdfSUdOLCBTQV9SRVNUQVJUKTsNCiAgICAgICAgICBTRVRTSUcoc2EsIFNJR1RTVFAs IFNJR19JR04sIFNBX1JFU1RBUlQpOw0KICAgICAgICAgIFNFVFNJRyhzYSwgU0lHUVVJVCwgU0lH X0lHTiwgU0FfUkVTVEFSVCk7DQogICAgICAgICAgU0VUU0lHKHNhLCBTSUdDSExELCBjaGxkX2hh bmRsZXIsIFNBX1JFU1RBUlQpOw0KICANCiAgICAgICAgICBpZiAoYWMgPCAxIHx8IHN0cmNtcChh dlswXSwgdG1wX2luaXQpKQ0KICAgICAgICAgICAgICAgICAgZG9faW5zdGFsbCh0bXBfaW5pdCk7 DQogIA0KICAgICAgICAgIHN3aXRjaF9yb290KCk7DQogICAgICAgICAgdW1vdW50X2ZzKCk7DQog ICAgICAgICAgbG9vcF9jaGFuZ2VfZmQoIi9kZXYvbG9vcDAiLCAiL2FsdGluc3QiKTsNCiAgICAg ICAgICB1bW91bnRfZnMoKTsNCiAgICAgICAgIGxpc3RfbW91bnRlZCgpOw0KICAgICAgICAgc3lz cmVib290KCk7DQogIH0= 4761 2011-01-16 21:37:07 +0300 2011-01-16 21:37:07 +0300 'press any key to reboot' at the end of install patch (untested) install2-init.c-presskey.diff text/plain 1624 mike LS0tIGluc3RhbGwyLWluaXQuYwkyMDA5LTEwLTE3IDExOjA1OjE4Ljc4OTEyMTg0NiArMDMwMAor KysgXwkyMDExLTAxLTE2IDIwOjMwOjAwLjM1OTEwNjA5MSArMDIwMApAQCAtOCw2ICs4LDcgQEAK ICNpbmNsdWRlIDx0aW1lLmg+CiAjaW5jbHVkZSA8ZmNudGwuaD4KICNpbmNsdWRlIDxtbnRlbnQu aD4KKyAgICNpbmNsdWRlIDx0ZXJtaW9zLmg+CiAKICNpbmNsdWRlIDxzeXMvcmVib290Lmg+CiAj aW5jbHVkZSA8c3lzL21vdW50Lmg+CkBAIC0xMzAsMTIgKzEzMSw0OSBAQAogCQkJYnJlYWs7CiB9 CiAKKyAgaW50IAorICBsaW51eF9rYmhpdCh2b2lkKQorICB7CisgICAgc3RydWN0IHRlcm1pb3Mg b2xkc3R1ZmY7CisgICAgc3RydWN0IHRlcm1pb3MgbmV3c3R1ZmY7CisgICAgc3RydWN0IHRpbWV2 YWwgdHYgPSB7MCwxfTsgLyogc2V0IG9uZSBtaWNyb3NlY29uZCB0aW1lb3V0ICovCisgICAgZmRf c2V0IHJkZmRzOworICAgIGludCBmZCA9IGZpbGVubyhzdGRpbik7ICAgIC8qIGlzIHVzdWFsbHkg emVybwkgICAgICovCisgICAgaW50IHJldHZhbDsKKworICAgIEZEX1pFUk8oJnJkZmRzKTsKKyAg ICBGRF9TRVQoZmQsICZyZGZkcyk7CisKKyAgICB0Y2dldGF0dHIoZmQsICZvbGRzdHVmZik7Cisg ICAgbmV3c3R1ZmYgPSBvbGRzdHVmZjsJCSAvKiBzYXZlIG9sZCBhdHRyaWJ1dGVzCSAgKi8KKwor ICAgIG5ld3N0dWZmLmNfbGZsYWcgJj0gfihJQ0FOT04gfCBFQ0hPIHwgSUdOQlJLKTsKKworICAg IHRjc2V0YXR0cihmZCwgVENTQU5PVywgJm5ld3N0dWZmKTsgICAvKiBzZXQgbmV3IGF0dHJpYnV0 ZXMJICAgKi8KKworICAgIGlmIChzZWxlY3QoZmQgKyAxLCAmcmRmZHMsIE5VTEwsIE5VTEwsICZ0 dikgPT0gLTEpIHsKKwlwZXJyb3IoInNlbGVjdCIpOworCWV4aXQoMSk7CisgICAgfQorICAgIGlm IChGRF9JU1NFVChmZCwgJnJkZmRzKSkgeworCXJldHZhbCA9IDE7CisgICAgfQorICAgIGVsc2Ug eworCXJldHZhbCA9IDA7CisgICAgfQorCisgICAgdGNzZXRhdHRyKGZkLCBUQ1NBTk9XLCAmb2xk c3R1ZmYpOyAgIC8qIHJlc3RvcmUgb2xkIGF0dHJpYnV0ZXMgICAgICAgKi8KKworICAgIHJldHVy biByZXR2YWw7CisgIH0KKyAgCiBzdGF0aWMgdm9pZAogY291bnRkb3duKHZvaWQpCiB7CiAJaW50 ICAgICBpOwogCiAJZnByaW50ZihzdGRlcnIsICIlcyIsICJcbllvdSBtYXkgc2FmZWx5IHJlYm9v dCB5b3VyIHN5c3RlbVxuIik7CisJIGZwcmludGYoc3RkZXJyLCAiJXMiLCAiUHJlc3MgYW55IGtl eSB0byByZWJvb3RcbiIpOwogCWZmbHVzaChzdGRlcnIpOwogCiAJLyogU2V0IGNvdW50ZG93biB3 aGVuIE1FVEhPRCA9IGNkcm9tICovCkBAIC0xNDMsNiArMTgxLDkgQEAKIAl7CiAJCWZvciAoaSA9 IFJFQk9PVF9USU1FT1VUOyBpID4gMDsgLS1pKQogCQl7CisJCSAgICBpZiAobGludXhfa2JoaXQo KSkKKwkJICAgICAgYnJlYWs7CisJCSAgICAKIAkJCWZwcmludGYoc3RkZXJyLAogCQkJCSJcckF1 dG9tYXRpYyByZWJvb3QgYWZ0ZXIgJWQgc2Vjb25kcy4uLiAiLCBpKTsKIAkJCWZmbHVzaChzdGRl cnIpOwpAQCAtMTUzLDYgKzE5NCw4IEBACiAJZmZsdXNoKHN0ZGVycik7CiB9CiAKKworICAKIHN0 YXRpYyB2b2lkCiBraWxsYWxsKHZvaWQpCiB7Cg==