9554 2006-05-13 11:13:34 +0400 Problems with mounting removable disks with vfat using pmount in different locales 2008-07-25 01:21:11 +0400 1 1 4 Development Sisyphus pmount unstable all Linux CLOSED FIXED P2 normal --- 1 serpiph rider abulava lav qa-sisyphus oldest_to_newest 37974 0 serpiph 2006-05-13 11:13:35 +0400 При использовании связки ivman+pmount (или просто pmount) при монтировании USB-flash или переносных винчестеров на разных компьютерах с разными системными локалями возникает проблема с использованием русских букв в имени файлов. Предлагаю патч, который добавляет к pmount параметр --codepage (или -P) и соответствует аналогичному параметру команды mount. Также в структуру FS добавлено поле has_codepage, отмечающий, доступен ли этот параметр данной файловой системе. Исправлен файл pmount.1. Я не затронул переводов. 37975 1 1481 serpiph 2006-05-13 11:16:28 +0400 Created attachment 1481 Add --codepage to pmount 37977 2 serpiph 2006-05-13 11:21:21 +0400 Кстати, предлагаю внести изменения в spec: в секцию %build перед automake поставить aclocal, в противном случае пакет может не пересобраться. Прошу проверить. 40931 3 abulava 2006-09-29 15:59:09 +0400 Что интересно - у pmount уже и так есть ключ -c (--charset) $ pmount -V 0.9.11 Действительно до сих пор актуально? 40933 4 serpiph 2006-09-29 16:12:50 +0400 (In reply to comment #3) Система Сизиф от 01.09.2006. Проблема периодически появляется. Как решить - ума не приложу. Вроде, настройки все есть. $ pmount -V 0.9.11 $ rpm -q ivman ivman-0.6.12-alt1 Есть 2 компьютера: с CP1251 и KIO8-R. На компьютере с CP1251 ivman перевирает кодировку. Попробую ещё раз понастраивать. Да, ещё. В твоём письме по ivman есть такие строки: ======================= В общем, у меня работает <ivm:Option name="mountcommand" value="pmount -c cp1251 '$hal.block.device$'" /> <ivm:Option name="umountcommand" value="pumount '$hal.block.device$'" /> в ~/.ivman/IvmConfigBase.xml ======================= А в файлах ivman есть команды mount и umount, а про твои варианты ни слова. > Что интересно - у pmount уже и так есть ключ -c (--charset) > > $ pmount -V > 0.9.11 > > Действительно до сих пор актуально? Если будет неактуально, то закрою. 41497 5 icesik 2006-10-18 16:37:41 +0400 Должно быть исправлено в этой версии: [icesik@iceberg SRPMS]$ rpm -qp --lastchange pmount-0.9.13-alt1.src.rpm * Срд Окт 18 2006 Igor Zubkov <icesik@altlinux.org> 0.9.13-alt1 - 0.9.11 -> 0.9.13 (#10056) - fix problem with charsets (#9554 and #10137) - fix working with cryptsetup - closes #8081, typo in pmount manual page - add requires to mount - add docs - mark config /etc/pmount.allow as noreplace - buildreq - small spec clean up [icesik@iceberg SRPMS]$ Которая только что ушла в /i/S/ на сборку. 41607 6 abulava 2006-10-23 14:55:24 +0400 (In reply to comment #5) > Должно быть исправлено в этой версии: > [icesik@iceberg SRPMS]$ rpm -qp --lastchange pmount-0.9.13-alt1.src.rpm > Которая только что ушла в /i/S/ на сборку. Возможно, но только если ivman использует pmount-hal. У меня в /etc/hal/fdi/policy/01-charset.fdi: <?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> <deviceinfo version="0.2"> <device> <match key="volume.fstype" string="vfat"> <merge key="volume.policy.mount_option.iocharset" type="string">cp1251</merge> </match> </device> </deviceinfo> pmount-hal на это реагирует, а "просто pmount" - нет. Спасибо и на этом! IMHO, дальше надо пилить ivman, если не устраивает результат. 41611 7 icesik 2006-10-23 15:14:47 +0400 FIXED 1481 2006-05-13 11:16:28 +0400 2006-05-13 11:16:28 +0400 Add --codepage to pmount pmount-0.9.9-codepage.patch text/plain 11001 serpiph ZGlmZiAtTmF1cnAgcG1vdW50LTAuOS45Lm9yaWcvbWFuL3Btb3VudC4xIHBtb3VudC0wLjkuOS5u ZXcvbWFuL3Btb3VudC4xCi0tLSBwbW91bnQtMC45Ljkub3JpZy9tYW4vcG1vdW50LjEJMjAwNi0w Mi0yOCAyMTo1OToxNCArMDMwMAorKysgcG1vdW50LTAuOS45Lm5ldy9tYW4vcG1vdW50LjEJMjAw Ni0wNS0xMyAwOTo0NDoyNiArMDQwMApAQCAtMTU5LDYgKzE1OSwxNSBAQCBzdXBwb3J0IHNldHRp bmcgdGhlIGNoYXJhY3RlciBzZXQgKHNlZQogKDgpIGZvciBkZXRhaWxzKS4KIAogLlRQCisuQiBc LVAgXGZJY29kZXBhZ2VcZlIsIFxmQlwtXC1jb2RlcGFnZSBcZkljb2RlcGFnZQorVXNlIGdpdmVu IEkvTyBjaGFyYWN0ZXIgc2V0LiBUaGlzCitjb3JyZXNwb25kcyB3aXRoIHRoZSBtb3VudCBvcHRp b24KKy5CIGNvZGVwYWdlXGZSLiBUaGlzIG9wdGlvbiBpcyBpZ25vcmVkIGZvciBmaWxlIHN5c3Rl bXMgdGhhdCBkbyBub3QKK3N1cHBvcnQgc2V0dGluZyB0aGUgY29kZXBhZ2Ugc2V0IChzZWUKKy5C IG1vdW50CisoOCkgZm9yIGRldGFpbHMpLgorCisuVFAKIC5CIFwtdSBcZkl1bWFza1xmUiwgXGZC XC1cLXVtYXNrIFxmSXVtYXNrXGZSCiBVc2Ugc3BlY2lmaWVkIHVtYXNrIGluc3RlYWQgb2YgdGhl IGRlZmF1bHQgb25lLiBGb3IgVURGLCB0aGUgZGVmYXVsdAogaXMgJzAwNycsIGZvciBWRkFUIGFu ZCBOVEZTIHRoZSBkZWZhdWx0IGlzICcwNzcnLiBUaGlzIHZhbHVlIGlzCmRpZmYgLU5hdXJwIHBt b3VudC0wLjkuOS5vcmlnL3NyYy9mcy5jIHBtb3VudC0wLjkuOS5uZXcvc3JjL2ZzLmMKLS0tIHBt b3VudC0wLjkuOS5vcmlnL3NyYy9mcy5jCTIwMDYtMDEtMDYgMTk6MjI6MTcgKzAzMDAKKysrIHBt b3VudC0wLjkuOS5uZXcvc3JjL2ZzLmMJMjAwNi0wNS0xMyAwOTo0MjowMCArMDQwMApAQCAtMTks MTkgKzE5LDE5IEBACiAgKiB0byBjb21tYW5kIGxpbmUgb3B0aW9ucy4KICAqLwogc3RhdGljIHN0 cnVjdCBGUyBzdXBwb3J0ZWRfZnNbXSA9IHsKLSAgICB7ICJ1ZGYiLCAibm9zdWlkLG5vZGV2LHVz ZXIiLCAxLCAiMDA3IiwgMSB9LAotICAgIHsgImlzbzk2NjAiLCAibm9zdWlkLG5vZGV2LHVzZXIi LCAxLCBOVUxMLCAxIH0sCi0gICAgeyAidmZhdCIsICJub3N1aWQsbm9kZXYsdXNlcixxdWlldCxz aG9ydG5hbWU9bWl4ZWQiLCAxLCAiMDc3IiwgMSB9LAotICAgIHsgIm50ZnMiLCAibm9zdWlkLG5v ZGV2LHVzZXIiLCAxLCAiMDc3IiwgMSB9LAotICAgIHsgImhmc3BsdXMiLCAibm9zdWlkLG5vZGV2 LHVzZXIiLCAxLCBOVUxMLCAwIH0sCi0gICAgeyAiaGZzIiwgIm5vc3VpZCxub2Rldix1c2VyIiwg MSwgTlVMTCwgMCB9LAotICAgIHsgImV4dDMiLCAibm9kZXYsbm9hdXRvLG5vc3VpZCx1c2VyIiwg MCwgTlVMTCwgMCB9LAotICAgIHsgImV4dDIiLCAibm9kZXYsbm9hdXRvLG5vc3VpZCx1c2VyIiwg MCwgTlVMTCwgMCB9LAotICAgIHsgInJlaXNlcmZzIiwgIm5vZGV2LG5vYXV0byxub3N1aWQsdXNl ciIsIDAsIE5VTEwsIDAgfSwKLSAgICB7ICJyZWlzZXI0IiwgIm5vZGV2LG5vYXV0byxub3N1aWQs dXNlciIsIDAsIE5VTEwsIDAgfSwKLSAgICB7ICJ4ZnMiLCAibm9kZXYsbm9hdXRvLG5vc3VpZCx1 c2VyIiwgMCwgTlVMTCwgMCB9LAotICAgIHsgImpmcyIsICJub2Rldixub2F1dG8sbm9zdWlkLHVz ZXIiLCAwLCBOVUxMLCAxIH0sCi0gICAgeyBOVUxMLCBOVUxMLCAwLCBOVUxMLCAwfQorICAgIHsg InVkZiIsICJub3N1aWQsbm9kZXYsdXNlciIsIDEsICIwMDciLCAxLCAwIH0sCisgICAgeyAiaXNv OTY2MCIsICJub3N1aWQsbm9kZXYsdXNlciIsIDEsIE5VTEwsIDEsIDAgfSwKKyAgICB7ICJ2ZmF0 IiwgIm5vc3VpZCxub2Rldix1c2VyLHF1aWV0LHNob3J0bmFtZT1taXhlZCIsIDEsICIwNzciLCAx LCAxIH0sCisgICAgeyAibnRmcyIsICJub3N1aWQsbm9kZXYsdXNlciIsIDEsICIwNzciLCAxLCAw IH0sCisgICAgeyAiaGZzcGx1cyIsICJub3N1aWQsbm9kZXYsdXNlciIsIDEsIE5VTEwsIDAsIDAg fSwKKyAgICB7ICJoZnMiLCAibm9zdWlkLG5vZGV2LHVzZXIiLCAxLCBOVUxMLCAwLCAwIH0sCisg ICAgeyAiZXh0MyIsICJub2Rldixub2F1dG8sbm9zdWlkLHVzZXIiLCAwLCBOVUxMLCAwLCAwIH0s CisgICAgeyAiZXh0MiIsICJub2Rldixub2F1dG8sbm9zdWlkLHVzZXIiLCAwLCBOVUxMLCAwLCAw IH0sCisgICAgeyAicmVpc2VyZnMiLCAibm9kZXYsbm9hdXRvLG5vc3VpZCx1c2VyIiwgMCwgTlVM TCwgMCwgMCB9LAorICAgIHsgInJlaXNlcjQiLCAibm9kZXYsbm9hdXRvLG5vc3VpZCx1c2VyIiwg MCwgTlVMTCwgMCwgMCB9LAorICAgIHsgInhmcyIsICJub2Rldixub2F1dG8sbm9zdWlkLHVzZXIi LCAwLCBOVUxMLCAwLCAwIH0sCisgICAgeyAiamZzIiwgIm5vZGV2LG5vYXV0byxub3N1aWQsdXNl ciIsIDAsIE5VTEwsIDEsIDAgfSwKKyAgICB7IE5VTEwsIE5VTEwsIDAsIE5VTEwsIDAsIDB9CiB9 OwogCiBjb25zdCBzdHJ1Y3QgRlMqCmRpZmYgLU5hdXJwIHBtb3VudC0wLjkuOS5vcmlnL3NyYy9m cy5oIHBtb3VudC0wLjkuOS5uZXcvc3JjL2ZzLmgKLS0tIHBtb3VudC0wLjkuOS5vcmlnL3NyYy9m cy5oCTIwMDUtMTAtMTMgMTg6NTk6MDYgKzA0MDAKKysrIHBtb3VudC0wLjkuOS5uZXcvc3JjL2Zz LmgJMjAwNi0wNS0xMyAwOTozOTowNSArMDQwMApAQCAtMjAsNiArMjAsNyBAQCBzdHJ1Y3QgRlMg ewogICAgIGludCBzdXBwb3J0X3VnaWQ7ICAgICAgLyogd2hldGhlciB0aGUgZnMgc3VwcG9ydHMg dWlkIGFuZCBnaWQgb3B0aW9ucyAqLwogICAgIGNvbnN0IGNoYXIqIHVtYXNrOyAgICAgLyogdW1h c2sgdmFsdWUgKE5VTEwgaWYgdW1hc2sgaXMgbm90IHN1cHBvcnRlZCkgKi8KICAgICBpbnQgc3Vw cG9ydF9pb2NoYXJzZXQ7IC8qIHdoZXRoZXIgdGhlIGZzIHN1cHBvcnRzIHRoZSBpb2NoYXJzZXQg b3B0aW9uICovCisgICAgaW50IHN1cHBvcnRfY29kZXBhZ2U7ICAvKiB3aGV0aGVyIHRoZSBmcyBz dXBwb3J0cyB0aGUgY29kZXBhZ2Ugb3B0aW9uICovCiB9OwogCiAvKioKZGlmZiAtTmF1cnAgcG1v dW50LTAuOS45Lm9yaWcvc3JjL3Btb3VudC5jIHBtb3VudC0wLjkuOS5uZXcvc3JjL3Btb3VudC5j Ci0tLSBwbW91bnQtMC45Ljkub3JpZy9zcmMvcG1vdW50LmMJMjAwNS0xMi0xNiAxNDoxNzoyNSAr MDMwMAorKysgcG1vdW50LTAuOS45Lm5ldy9zcmMvcG1vdW50LmMJMjAwNi0wNS0xMyAxMDowNTo0 NyArMDQwMApAQCAtNjUsMjIgKzY1LDIzIEBAIHVzYWdlKCBjb25zdCBjaGFyKiBleGVuYW1lICkK ICAgICAiICBSZW1vdmUgdGhlIGxvY2sgb24gPGRldmljZT4gZm9yIHByb2Nlc3MgPHBpZD4gYWdh aW4uXG5cbiIpLAogICAgICAgICBleGVuYW1lKTsKICAgICBwdXRzKCBfKCJPcHRpb25zOlxuIgot ICAgICIgIC1yICAgICAgICAgIDogZm9yY2UgPGRldmljZT4gdG8gYmUgbW91bnRlZCByZWFkLW9u bHlcbiIKLSAgICAiICAtdyAgICAgICAgICA6IGZvcmNlIDxkZXZpY2U+IHRvIGJlIG1vdW50ZWQg cmVhZC13cml0ZVxuIgotICAgICIgIC1zLCAtLXN5bmMgIDogbW91bnQgPGRldmljZT4gd2l0aCB0 aGUgJ3N5bmMnIG9wdGlvbiAoZGVmYXVsdDogJ2FzeW5jJylcbiIKLSAgICAiICAtLW5vYXRpbWUg ICA6IG1vdW50IDxkZXZpY2U+IHdpdGggdGhlICdub2F0aW1lJyBvcHRpb24gKGRlZmF1bHQ6ICdh dGltZScpXG4iCi0gICAgIiAgLWUsIC0tZXhlYyAgOiBtb3VudCA8ZGV2aWNlPiB3aXRoIHRoZSAn ZXhlYycgb3B0aW9uIChkZWZhdWx0OiAnbm9leGVjJylcbiIKLSAgICAiICAtdCA8ZnM+ICAgICA6 IG1vdW50IGFzIGZpbGUgc3lzdGVtIHR5cGUgPGZzPiAoZGVmYXVsdDogYXV0b2RldGVjdGVkKVxu IgotICAgICIgIC1jIDxjaGFyc2V0PjogdXNlIGdpdmVuIEkvTyBjaGFyYWN0ZXIgc2V0IChkZWZh dWx0OiAndXRmOCcgaWYgY2FsbGVkXG4iCi0gICAgIiAgICAgICAgICAgICAgICBpbiBhbiBVVEYt OCBsb2NhbGUsIG90aGVyd2lzZSBtb3VudCBkZWZhdWx0KVxuIgotICAgICIgIC11IDx1bWFzaz4g IDogdXNlIHNwZWNpZmllZCB1bWFzayBpbnN0ZWFkIG9mIHRoZSBkZWZhdWx0IChvbmx5IGZvclxu IgotICAgICIgICAgICAgICAgICAgICAgZmlsZSBzeXRlbXMgd2hpY2ggYWN0dWFsbHkgc3VwcG9y dCB1bWFzayBzZXR0aW5nKVxuIgorICAgICIgIC1yICAgICAgICAgICA6IGZvcmNlIDxkZXZpY2U+ IHRvIGJlIG1vdW50ZWQgcmVhZC1vbmx5XG4iCisgICAgIiAgLXcgICAgICAgICAgIDogZm9yY2Ug PGRldmljZT4gdG8gYmUgbW91bnRlZCByZWFkLXdyaXRlXG4iCisgICAgIiAgLXMsIC0tc3luYyAg IDogbW91bnQgPGRldmljZT4gd2l0aCB0aGUgJ3N5bmMnIG9wdGlvbiAoZGVmYXVsdDogJ2FzeW5j JylcbiIKKyAgICAiICAtLW5vYXRpbWUgICAgOiBtb3VudCA8ZGV2aWNlPiB3aXRoIHRoZSAnbm9h dGltZScgb3B0aW9uIChkZWZhdWx0OiAnYXRpbWUnKVxuIgorICAgICIgIC1lLCAtLWV4ZWMgICA6 IG1vdW50IDxkZXZpY2U+IHdpdGggdGhlICdleGVjJyBvcHRpb24gKGRlZmF1bHQ6ICdub2V4ZWMn KVxuIgorICAgICIgIC10IDxmcz4gICAgICA6IG1vdW50IGFzIGZpbGUgc3lzdGVtIHR5cGUgPGZz PiAoZGVmYXVsdDogYXV0b2RldGVjdGVkKVxuIgorICAgICIgIC1jIDxjaGFyc2V0PiA6IHVzZSBn aXZlbiBJL08gY2hhcmFjdGVyIHNldCAoZGVmYXVsdDogJ3V0ZjgnIGlmIGNhbGxlZFxuIgorICAg ICIgICAgICAgICAgICAgICAgIGluIGFuIFVURi04IGxvY2FsZSwgb3RoZXJ3aXNlIG1vdW50IGRl ZmF1bHQpXG4iCisgICAgIiAgLVAgPGNvZGVwYWdlPjogdXNlIGdpdmVuIGNvZGVwYWdlIHNldFxu IgorICAgICIgIC11IDx1bWFzaz4gICA6IHVzZSBzcGVjaWZpZWQgdW1hc2sgaW5zdGVhZCBvZiB0 aGUgZGVmYXVsdCAob25seSBmb3JcbiIKKyAgICAiICAgICAgICAgICAgICAgICBmaWxlIHN5dGVt cyB3aGljaCBhY3R1YWxseSBzdXBwb3J0IHVtYXNrIHNldHRpbmcpXG4iCiAgICAgIiAtLXBhc3Nw aHJhc2UgPGZpbGU+XG4iCi0gICAgIiAgICAgICAgICAgICAgICByZWFkIHBhc3NwaHJhc2UgZnJv bSBmaWxlIGluc3RlYWQgb2YgdGhlIHRlcm1pbmFsXG4iCi0gICAgIiAgICAgICAgICAgICAgICAo b25seSBmb3IgTFVLUyBlbmNyeXB0ZWQgZGV2aWNlcylcbiIKLSAgICAiICAtZCwgLS1kZWJ1ZyA6 IGVuYWJsZSBkZWJ1ZyBvdXRwdXQgKHZlcnkgdmVyYm9zZSlcbiIKLSAgICAiICAtaCwgLS1oZWxw ICA6IHByaW50IGhlbHAgbWVzc2FnZSBhbmQgZXhpdCBzdWNjZXNzZnVseVxuIgotICAgICIgIC0t dmVyc2lvbiAgIDogcHJpbnQgdmVyc2lvbiBudW1iZXIgYW5kIGV4aXQgc3VjY2Vzc2Z1bGx5Iikg KTsKKyAgICAiICAgICAgICAgICAgICAgICByZWFkIHBhc3NwaHJhc2UgZnJvbSBmaWxlIGluc3Rl YWQgb2YgdGhlIHRlcm1pbmFsXG4iCisgICAgIiAgICAgICAgICAgICAgICAgKG9ubHkgZm9yIExV S1MgZW5jcnlwdGVkIGRldmljZXMpXG4iCisgICAgIiAgLWQsIC0tZGVidWcgIDogZW5hYmxlIGRl YnVnIG91dHB1dCAodmVyeSB2ZXJib3NlKVxuIgorICAgICIgIC1oLCAtLWhlbHAgICA6IHByaW50 IGhlbHAgbWVzc2FnZSBhbmQgZXhpdCBzdWNjZXNzZnVseVxuIgorICAgICIgIC0tdmVyc2lvbiAg ICA6IHByaW50IHZlcnNpb24gbnVtYmVyIGFuZCBleGl0IHN1Y2Nlc3NmdWxseSIpICk7CiB9CiAK IC8qKgpAQCAtMjAwLDYgKzIwMSw4IEBAIGRvX21vdW50X2ZzdGFiKCBjb25zdCBjaGFyKiBkZXZp Y2UgKQogICogQHBhcmFtIGZvcmNlX3dyaXRlIDEgZm9yIGZvcmNlZCByL3csIDAgZm9yIGZvcmNl ZCByL28sIC0xIGZvciBrZXJuZWwgZGVmYXVsdAogICogQHBhcmFtIGlvY2hhcnNldCBjaGFyc2V0 IHRvIHVzZSBmb3IgZmlsZSBuYW1lIGNvbnZlcnNpb247IE5VTEwgZm9yIG1vdW50CiAgKiAgICAg ICAgZGVmYXVsdAorICogQHBhcmFtIGNvZGVwYWdlIGNvZGVwYWdlIHRvIHVzZSBmb3IgZmlsZSBu YW1lIGNvbnZlcnNpb247IE5VTEwgZm9yIG1vdW50CisgKiAgICAgICAgZGVmYXVsdAogICogQHBh cmFtIHVtYXNrIFVzZXIgc3BlY2lmaWVkIHVtYXNrIChOVUxMIGZvciBkZWZhdWx0KQogICogQHBh cmFtIHN1cHByZXNzX2Vycm9yczogaWYgdHJ1ZSwgc3RkZXJyIGlzIHJlZGlyZWN0ZWQgdG8gL2Rl di9udWxsCiAgKiBAcmV0dXJuIGV4aXQgc3RhdHVzIG9mIG1vdW50LCBvciAtMSBvbiBmYWlsdXJl LgpAQCAtMjA3LDEyICsyMTAsMTMgQEAgZG9fbW91bnRfZnN0YWIoIGNvbnN0IGNoYXIqIGRldmlj ZSApCiBpbnQKIGRvX21vdW50KCBjb25zdCBjaGFyKiBkZXZpY2UsIGNvbnN0IGNoYXIqIG1udHB0 LCBjb25zdCBjaGFyKiBmc25hbWUsIGludCBhc3luYywKICAgICAgICAgaW50IG5vYXRpbWUsIGlu dCBleGVjLCBpbnQgZm9yY2Vfd3JpdGUsIGNvbnN0IGNoYXIqIGlvY2hhcnNldCwgY29uc3QKLSAg ICAgICAgY2hhciogdW1hc2ssIGludCBzdXBwcmVzc19lcnJvcnMgKQorCWNoYXIqIGNvZGVwYWdl LCBjb25zdCBjaGFyKiB1bWFzaywgaW50IHN1cHByZXNzX2Vycm9ycyApCiB7CiAgICAgY29uc3Qg c3RydWN0IEZTKiBmczsKICAgICBjaGFyIHVnaWRfb3B0WzEwMF07CiAgICAgY2hhciB1bWFza19v cHRbMTAwXTsKICAgICBjaGFyIGlvY2hhcnNldF9vcHRbMTAwXTsKKyAgICBjaGFyIGNvZGVwYWdl X29wdFsxMDBdOwogICAgIGNvbnN0IGNoYXIqIHN5bmNfb3B0ID0gIixzeW5jIjsKICAgICBjb25z dCBjaGFyKiBhdGltZV9vcHQgPSAiLGF0aW1lIjsKICAgICBjb25zdCBjaGFyKiBleGVjX29wdCA9 ICIsbm9leGVjIjsKQEAgLTIzOCw3ICsyNDIsNyBAQCBkb19tb3VudCggY29uc3QgY2hhciogZGV2 aWNlLCBjb25zdCBjaGFyCiAgICAgfQogCiAgICAgLyogYXNzZW1ibGUgb3B0aW9uIHN0cmluZyAq LwotICAgICp1Z2lkX29wdCA9ICp1bWFza19vcHQgPSAqaW9jaGFyc2V0X29wdCA9IDA7CisgICAg KnVnaWRfb3B0ID0gKnVtYXNrX29wdCA9ICppb2NoYXJzZXRfb3B0ID0gKmNvZGVwYWdlX29wdCA9 IDA7CiAgICAgaWYoIGZzLT5zdXBwb3J0X3VnaWQgKQogICAgICAgICBzbnByaW50ZiggdWdpZF9v cHQsIHNpemVvZiggdWdpZF9vcHQgKSwgIix1aWQ9JWksZ2lkPSVpIiwgCiAgICAgICAgICAgICAg ICAgZ2V0dWlkKCksIGdldGdpZCgpICk7CkBAIC0yNzEsOSArMjc1LDE3IEBAIGRvX21vdW50KCBj b25zdCBjaGFyKiBkZXZpY2UsIGNvbnN0IGNoYXIKICAgICAgICAgc25wcmludGYoIGlvY2hhcnNl dF9vcHQsIHNpemVvZiggaW9jaGFyc2V0X29wdCApLCAiLGlvY2hhcnNldD0lcyIsIGlvY2hhcnNl dCApOwogICAgIH0KIAotICAgIHNucHJpbnRmKCBvcHRpb25zLCBzaXplb2YoIG9wdGlvbnMgKSwg IiVzJXMlcyVzJXMlcyVzJXMiLCAKKyAgICBpZiggY29kZXBhZ2UgJiYgZnMtPnN1cHBvcnRfY29k ZXBhZ2UgKSB7CisgICAgICAgIGlmKCAhaXNfd29yZF9zdHIoIGNvZGVwYWdlICkgKSB7CisgICAg ICAgICAgICBmcHJpbnRmKCBzdGRlcnIsIF8oIkVycm9yOiBpbnZhbGlkIGNvZGVwYWdlIG5hbWUg JyVzJ1xuIiksIGNvZGVwYWdlICk7CisgICAgICAgICAgICByZXR1cm4gLTE7CisgICAgICAgIH0K KyAgICAgICAgc25wcmludGYoIGNvZGVwYWdlX29wdCwgc2l6ZW9mKCBjb2RlcGFnZV9vcHQgKSwg Iixjb2RlcGFnZT0lcyIsIGNvZGVwYWdlICk7CisgICAgfQorCisgICAgc25wcmludGYoIG9wdGlv bnMsIHNpemVvZiggb3B0aW9ucyApLCAiJXMlcyVzJXMlcyVzJXMlcyVzIiwgCiAgICAgICAgICAg ICBmcy0+b3B0aW9ucywgc3luY19vcHQsIGF0aW1lX29wdCwgZXhlY19vcHQsIGFjY2Vzc19vcHQs IHVnaWRfb3B0LAotICAgICAgICAgICAgdW1hc2tfb3B0LCBpb2NoYXJzZXRfb3B0ICk7CisgICAg ICAgICAgICB1bWFza19vcHQsIGlvY2hhcnNldF9vcHQsIGNvZGVwYWdlX29wdCApOwogCiAgICAg LyogZ28gZm9yIGl0ICovCiAgICAgcmV0dXJuIHNwYXdubCggU1BBV05fRVJPT1QgfCBTUEFXTl9S Uk9PVCB8IChzdXBwcmVzc19lcnJvcnMgPyBTUEFXTl9OT19TVERFUlIgOiAwICksCkBAIC0yOTMs MTMgKzMwNSwxNSBAQCBkb19tb3VudCggY29uc3QgY2hhciogZGV2aWNlLCBjb25zdCBjaGFyCiAg KiBAcGFyYW0gZm9yY2Vfd3JpdGUgMSBmb3IgZm9yY2VkIHIvdywgMCBmb3IgZm9yY2VkIHIvbywg LTEgZm9yIGtlcm5lbCBkZWZhdWx0CiAgKiBAcGFyYW0gaW9jaGFyc2V0IGNoYXJzZXQgdG8gdXNl IGZvciBmaWxlIG5hbWUgY29udmVyc2lvbjsgTlVMTCBmb3IgbW91bnQKICAqICAgICAgICBkZWZh dWx0CisgKiBAcGFyYW0gY29kZXBhZ2UgY29kZXBhZ2UgdG8gdXNlIGZvciBmaWxlIG5hbWUgY29u dmVyc2lvbjsgTlVMTCBmb3IgbW91bnQKKyAqICAgICAgICBkZWZhdWx0CiAgKiBAcGFyYW0gdW1h c2sgVXNlciBzcGVjaWZpZWQgdW1hc2sgKE5VTEwgZm9yIGRlZmF1bHQpCiAgKiBAcmV0dXJuIGxh c3QgcmV0dXJuIHZhbHVlIG9mIGRvX21vdW50IChpLiBlLiAwIG9uIHN1Y2Nlc3MsICE9IDAgb24g ZXJyb3IpCiAgKi8KIGludAogZG9fbW91bnRfYXV0byggY29uc3QgY2hhciogZGV2aWNlLCBjb25z dCBjaGFyKiBtbnRwdCwgaW50IGFzeW5jLCAKICAgICAgICAgaW50IG5vYXRpbWUsIGludCBleGVj LCBpbnQgZm9yY2Vfd3JpdGUsIGNvbnN0IGNoYXIqIGlvY2hhcnNldCwgCi0gICAgICAgIGNvbnN0 IGNoYXIqIHVtYXNrICkKKyAgICAgICAgY29uc3QgY2hhciogY29kZXBhZ2UsIGNvbnN0IGNoYXIq IHVtYXNrICkKIHsKICAgICBjb25zdCBzdHJ1Y3QgRlMqIGZzOwogICAgIGludCBub3N0ZGVyciA9 IDE7CkBAIC0zMTAsMTQgKzMyNCwxNCBAQCBkb19tb3VudF9hdXRvKCBjb25zdCBjaGFyKiBkZXZp Y2UsIGNvbnN0CiAgICAgICAgIGlmKCAoZnMrMSktPmZzbmFtZSA9PSBOVUxMICkKICAgICAgICAg ICAgIG5vc3RkZXJyID0gMDsKICAgICAgICAgcmVzdWx0ID0gZG9fbW91bnQoIGRldmljZSwgbW50 cHQsIGZzLT5mc25hbWUsIGFzeW5jLCBub2F0aW1lLCBleGVjLAotICAgICAgICAgICAgICAgIGZv cmNlX3dyaXRlLCBpb2NoYXJzZXQsIHVtYXNrLCBub3N0ZGVyciApOworICAgICAgICAgICAgICAg IGZvcmNlX3dyaXRlLCBpb2NoYXJzZXQsIGNvZGVwYWdlLCB1bWFzaywgbm9zdGRlcnIgKTsKICAg ICAgICAgaWYoIHJlc3VsdCA9PSAwICkKICAgICAgICAgICAgIGJyZWFrOwogCiAJLyogc29tZXRp bWVzIFZGQVQgZmFpbHMgd2hlbiB1c2luZyBpb2NoYXJzZXQ7IHRyeSBhZ2FpbiB3aXRob3V0ICov CiAJaWYoIGlvY2hhcnNldCApCiAJICAgIHJlc3VsdCA9IGRvX21vdW50KCBkZXZpY2UsIG1udHB0 LCBmcy0+ZnNuYW1lLCBhc3luYywgbm9hdGltZSwgZXhlYywKLSAgICAgICAgICAgICAgICAgICAg Zm9yY2Vfd3JpdGUsIE5VTEwsIHVtYXNrLCBub3N0ZGVyciApOworICAgICAgICAgICAgICAgICAg ICBmb3JjZV93cml0ZSwgTlVMTCwgTlVMTCwgdW1hc2ssIG5vc3RkZXJyICk7CiAgICAgICAgIGlm KCByZXN1bHQgPD0gMCApCiAgICAgICAgICAgICBicmVhazsKICAgICB9CkBAIC00ODUsNiArNDk5 LDcgQEAgbWFpbiggaW50IGFyZ2MsIGNoYXIqKiBhcmd2ICkKICAgICBpbnQgZm9yY2Vfd3JpdGUg PSAtMTsgLyogMDogcm8sIDE6IHJ3LCAtMTogZGVmYXVsdCAqLwogICAgIGNvbnN0IGNoYXIqIHVz ZV9mc3R5cGUgPSBOVUxMOwogICAgIGNvbnN0IGNoYXIqIGlvY2hhcnNldCA9IE5VTEw7CisgICAg Y29uc3QgY2hhciogY29kZXBhZ2UgPSBOVUxMOwogICAgIGNvbnN0IGNoYXIqIHVtYXNrID0gTlVM TDsKICAgICBjb25zdCBjaGFyKiBwYXNzcGhyYXNlID0gTlVMTDsKICAgICBpbnQgcmVzdWx0OwpA QCAtNTAyLDYgKzUxNyw3IEBAIG1haW4oIGludCBhcmdjLCBjaGFyKiogYXJndiApCiAgICAgICAg IHsgImV4ZWMiLCAwLCBOVUxMLCAnZScgfSwKICAgICAgICAgeyAidHlwZSIsIDEsIE5VTEwsICd0 JyB9LAogICAgICAgICB7ICJjaGFyc2V0IiwgMSwgTlVMTCwgJ2MnIH0sCisgICAgICAgIHsgImNv ZGVwYWdlIiwgMSwgTlVMTCwgJ1AnIH0sCiAgICAgICAgIHsgInVtYXNrIiwgMSwgTlVMTCwgJ3Un IH0sCiAgICAgICAgIHsgInBhc3NwaHJhc2UiLCAxLCBOVUxMLCAncCcgfSwKICAgICAgICAgeyAi cmVhZC1vbmx5IiwgMCwgTlVMTCwgJ3InIH0sCkBAIC01NDksNiArNTY1LDggQEAgbWFpbiggaW50 IGFyZ2MsIGNoYXIqKiBhcmd2ICkKIAogICAgICAgICAgICAgY2FzZSAnYyc6IGlvY2hhcnNldCA9 IG9wdGFyZzsgYnJlYWs7CiAKKyAgICAgICAgICAgIGNhc2UgJ1AnOiBjb2RlcGFnZSA9IG9wdGFy ZzsgYnJlYWs7CisKICAgICAgICAgICAgIGNhc2UgJ3UnOiB1bWFzayA9IG9wdGFyZzsgYnJlYWs7 CiAKICAgICAgICAgICAgIGNhc2UgJ3AnOiBwYXNzcGhyYXNlID0gb3B0YXJnOyBicmVhazsKQEAg LTY4NCwxMCArNzAyLDEwIEBAIG1haW4oIGludCBhcmdjLCBjaGFyKiogYXJndiApCiAgICAgICAg ICAgICAvKiBvZmYgd2UgZ28gKi8KICAgICAgICAgICAgIGlmKCB1c2VfZnN0eXBlICkKICAgICAg ICAgICAgICAgICByZXN1bHQgPSBkb19tb3VudCggZGVjcnlwdGVkX2RldmljZSwgbW50cHQsIHVz ZV9mc3R5cGUsIGFzeW5jLCBub2F0aW1lLAotICAgICAgICAgICAgICAgICAgICAgICAgZXhlYywg Zm9yY2Vfd3JpdGUsIGlvY2hhcnNldCwgdW1hc2ssIDAgKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgIGV4ZWMsIGZvcmNlX3dyaXRlLCBpb2NoYXJzZXQsIGNvZGVwYWdlLCB1bWFzaywgMCApOwog ICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIHJlc3VsdCA9IGRvX21vdW50X2F1dG8o IGRlY3J5cHRlZF9kZXZpY2UsIG1udHB0LCBhc3luYywgbm9hdGltZSwgZXhlYywKLSAgICAgICAg ICAgICAgICAgICAgICAgIGZvcmNlX3dyaXRlLCBpb2NoYXJzZXQsIHVtYXNrICk7IAorICAgICAg ICAgICAgICAgICAgICAgICAgZm9yY2Vfd3JpdGUsIGlvY2hhcnNldCwgY29kZXBhZ2UsIHVtYXNr ICk7IAogCiAgICAgICAgICAgICAvKiB1bmxvY2sgdGhlIG1vdW50IHBvaW50IGFnYWluICovCiAg ICAgICAgICAgICBkZWJ1ZyggInVubG9ja2luZyBtb3VudCBwb2ludCBkaXJlY3RvcnlcbiIgKTsK