60536 2026-09-14 19:08:40 +0300 etcnet-alt не импортирует VLAN-интерфейсы TYPE=vlan из /etc/net/ifaces 2026-09-14 19:08:40 +0300 1 1 4 Development Sisyphus NetworkManager unstable x86_64 Linux NEW P5 normal --- 1 glinkinvd sem sem qa-sisyphus oldest_to_newest 298670 0 22194 glinkinvd 2026-09-14 19:08:40 +0300 Created attachment 22194 Поддержка VLAN в плагине etcnet-alt Версия пакета: - NetworkManager-1.58.1-alt1 --- Описание проблемы: etcnet-alt перечисляет каталог VLAN в /etc/net/ifaces, но не импортирует его в NetworkManager. Причина в исходном коде: reader распознаёт только TYPE=eth и классифицирует TYPE=vlan как NM_DEVICE_TYPE_UNKNOWN. При NM_CONTROLLED=yes VLAN не помечается ignored, но NMConnection не создаётся; поэтому профиль и устройство отсутствуют без диагностического сообщения. --- Шаги воспроизведения: 1) Создать родительский интерфейс: # /etc/net/ifaces/ens19/options TYPE=eth BOOTPROTO=dhcp CONFIG_WIRELESS=no SYSTEMD_BOOTPROTO=dhcp4 CONFIG_IPV4=yes DISABLED=yes NM_CONTROLLED=yes SYSTEMD_CONTROLLED=no 2) Создать VLAN: # /etc/net/ifaces/ens19.100/options TYPE=vlan HOST=ens19 VID=100 ONBOOT=yes CONFIG_WIRELESS=no CONFIG_IPV4=yes CONFIG_IPV6=no BOOTPROTO=static SYSTEMD_BOOTPROTO=static DISABLED=yes NM_CONTROLLED=yes SYSTEMD_CONTROLLED=no 3) Указать валидный статический IPv4-адрес: # /etc/net/ifaces/ens19.100/ipv4address 192.168.0.1/24 4) Перезапустить NetworkManager: # systemctl restart NetworkManager --- Фактический результат: # nmcli connection show NAME UUID TYPE DEVICE System ens19 53f9d315-f525-eb7f-86ad-be8e1b9cf86f ethernet ens19 lo a89dd1d9-b1ab-4bde-b150-04f424d8ec68 loopback lo ens19 импортируется, а VLAN-профиль отсутствует. В журнале есть: etcnet-alt: ens19: Readed connection "System ens19" Но отсутствует аналогичная запись для ens19.100. --- Описание патча: Патч добавляет поддержку TYPE=vlan в etcnet-alt: - распознаёт TYPE=vlan как NM_DEVICE_TYPE_VLAN; - создаёт connection типа vlan; - создаёт NMSettingVlan; - преобразует HOST=ens19 в vlan.parent=ens19; - преобразует VID=100 в vlan.id=100; - добавляет wired setting, необходимый для валидной VLAN connection; - сохраняет существующий импорт Ethernet и Wi-Fi без изменений. Также добавлены unit-тесты: - static VLAN с ipv4.method=manual и валидным IPv4-адресом; - L2 VLAN с CONFIG_IPV4=no и ipv4.method=disabled. 22194 2026-09-14 19:08:40 +0300 2026-09-14 19:08:40 +0300 Поддержка VLAN в плагине etcnet-alt NetworkManager-1.58.1-alt1-etcnet-alt-vlan.patch text/plain 9861 glinkinvd ZGlmZiAtLWdpdCBhL3NyYy9jb3JlL3NldHRpbmdzL3BsdWdpbnMvZXRjbmV0LWFsdC9ubXMtZXRj bmV0LWFsdC1yZWFkZXIuYyBiL3NyYy9jb3JlL3NldHRpbmdzL3BsdWdpbnMvZXRjbmV0LWFsdC9u bXMtZXRjbmV0LWFsdC1yZWFkZXIuYwotLS0gYS9zcmMvY29yZS9zZXR0aW5ncy9wbHVnaW5zL2V0 Y25ldC1hbHQvbm1zLWV0Y25ldC1hbHQtcmVhZGVyLmMKKysrIGIvc3JjL2NvcmUvc2V0dGluZ3Mv cGx1Z2lucy9ldGNuZXQtYWx0L25tcy1ldGNuZXQtYWx0LXJlYWRlci5jCkBAIC0xMTU5LDYgKzEx NTksOTEgQEAgZXJyb3I6CiAgICAgcmV0dXJuIE5VTEw7CiB9CiAKK3N0YXRpYyBOTVNldHRpbmcg KgorbWFrZV92bGFuX3NldHRpbmcob3B0aW9uc19maWxlX3QgKm9wdGlvbnMsIEdFcnJvciAqKmVy cm9yKQoreworICAgIE5NU2V0dGluZ1ZsYW4gKnNfdmxhbiA9IE5VTEw7CisgICAgY2hhciAqICAg ICAgICAgaG9zdCAgID0gTlVMTDsKKyAgICBjaGFyICogICAgICAgICB2aWQgICAgPSBOVUxMOwor ICAgIGxvbmcgaW50ICAgICAgIHZsYW5faWQ7CisKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChv cHRpb25zICE9IE5VTEwsIE5VTEwpOworCisgICAgaG9zdCA9IG9wdGlvbnNfZ2V0X3ZhbHVlKG9w dGlvbnMsICJIT1NUIik7CisgICAgaWYgKCFob3N0IHx8ICFob3N0WzBdKSB7CisgICAgICAgIFBM VUdJTl9TRVRfRVJST1JfTElURVJBTChlcnJvciwgIk1pc3NpbmcgVkxBTiBIT1NUIG9wdGlvbiIp OworICAgICAgICBnb3RvIGRvbmU7CisgICAgfQorCisgICAgdmlkID0gb3B0aW9uc19nZXRfdmFs dWUob3B0aW9ucywgIlZJRCIpOworICAgIGlmICghdmlkIHx8ICFnZXRfaW50KHZpZCwgJnZsYW5f aWQpIHx8IHZsYW5faWQgPCAwIHx8IHZsYW5faWQgPiA0MDk0KSB7CisgICAgICAgIFBMVUdJTl9T RVRfRVJST1IoZXJyb3IsICJJbnZhbGlkIFZMQU4gVklEICclcyciLCB2aWQgPyB2aWQgOiAiIik7 CisgICAgICAgIGdvdG8gZG9uZTsKKyAgICB9CisKKyAgICBzX3ZsYW4gPSBOTV9TRVRUSU5HX1ZM QU4obm1fc2V0dGluZ192bGFuX25ldygpKTsKKyAgICBnX29iamVjdF9zZXQoc192bGFuLAorICAg ICAgICAgICAgICAgICBOTV9TRVRUSU5HX1ZMQU5fUEFSRU5ULAorICAgICAgICAgICAgICAgICBo b3N0LAorICAgICAgICAgICAgICAgICBOTV9TRVRUSU5HX1ZMQU5fSUQsCisgICAgICAgICAgICAg ICAgIChndWludDMyKSB2bGFuX2lkLAorICAgICAgICAgICAgICAgICBOVUxMKTsKKworZG9uZToK KyAgICBnX2ZyZWUoaG9zdCk7CisgICAgZ19mcmVlKHZpZCk7CisgICAgcmV0dXJuIE5NX1NFVFRJ Tkcoc192bGFuKTsKK30KKworc3RhdGljIE5NQ29ubmVjdGlvbiAqCityZWFkX3ZsYW5fY29ubmVj dGlvbihjb25zdCBjaGFyICogICAgaWZhY2VfcGF0aCwKKyAgICAgICAgICAgICAgICAgICAgIG9w dGlvbnNfZmlsZV90ICpvcHRpb25zLAorICAgICAgICAgICAgICAgICAgICAgR0Vycm9yICoqICAg ICAgIGVycm9yKQoreworICAgIE5NQ29ubmVjdGlvbiAqY29ubmVjdGlvbiAgICA9IE5VTEw7Cisg ICAgTk1TZXR0aW5nICogICBjb25fc2V0dGluZyAgID0gTlVMTDsKKyAgICBOTVNldHRpbmcgKiAg IHZsYW5fc2V0dGluZyAgPSBOVUxMOworICAgIE5NU2V0dGluZyAqICAgd2lyZWRfc2V0dGluZyA9 IE5VTEw7CisKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChpZmFjZV9wYXRoICE9IE5VTEwsIE5V TEwpOworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKG9wdGlvbnMgIT0gTlVMTCwgTlVMTCk7CisK KyAgICBjb25uZWN0aW9uID0gbm1fc2ltcGxlX2Nvbm5lY3Rpb25fbmV3KCk7CisgICAgaWYgKCFj b25uZWN0aW9uKSB7CisgICAgICAgIFBMVUdJTl9TRVRfRVJST1IoZXJyb3IsICJGYWlsZWQgdG8g YWxsb2NhdGUgbmV3IGNvbm5lY3Rpb24gZm9yICVzLiIsIGlmYWNlX3BhdGgpOworICAgICAgICBy ZXR1cm4gTlVMTDsKKyAgICB9CisKKyAgICBjb25fc2V0dGluZyA9IG1ha2VfY29ubmVjdGlvbl9z ZXR0aW5nKGlmYWNlX3BhdGgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBvcHRpb25zLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Tk1fU0VUVElOR19WTEFOX1NFVFRJTkdfTkFNRSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIE5VTEwpOworICAgIGlmICghY29uX3NldHRpbmcpIHsKKyAgICAgICAg UExVR0lOX1NFVF9FUlJPUl9MSVRFUkFMKGVycm9yLCAiRmFpbGVkIHRvIGNyZWF0ZSBjb25uZWN0 aW9uIHNldHRpbmcuIik7CisgICAgICAgIGdvdG8gZXJyb3I7CisgICAgfQorICAgIG5tX2Nvbm5l Y3Rpb25fYWRkX3NldHRpbmcoY29ubmVjdGlvbiwgY29uX3NldHRpbmcpOworCisgICAgdmxhbl9z ZXR0aW5nID0gbWFrZV92bGFuX3NldHRpbmcob3B0aW9ucywgZXJyb3IpOworICAgIGlmICghdmxh bl9zZXR0aW5nKQorICAgICAgICBnb3RvIGVycm9yOworICAgIG5tX2Nvbm5lY3Rpb25fYWRkX3Nl dHRpbmcoY29ubmVjdGlvbiwgdmxhbl9zZXR0aW5nKTsKKworICAgIHdpcmVkX3NldHRpbmcgPSBt YWtlX3dpcmVkX3NldHRpbmcoaWZhY2VfcGF0aCwgZXJyb3IpOworICAgIGlmICghd2lyZWRfc2V0 dGluZykKKyAgICAgICAgZ290byBlcnJvcjsKKyAgICBubV9jb25uZWN0aW9uX2FkZF9zZXR0aW5n KGNvbm5lY3Rpb24sIHdpcmVkX3NldHRpbmcpOworCisgICAgaWYgKCFubV9jb25uZWN0aW9uX3Zl cmlmeShjb25uZWN0aW9uLCBlcnJvcikpCisgICAgICAgIGdvdG8gZXJyb3I7CisKKyAgICByZXR1 cm4gY29ubmVjdGlvbjsKKworZXJyb3I6CisgICAgZ19vYmplY3RfdW5yZWYoY29ubmVjdGlvbik7 CisgICAgcmV0dXJuIE5VTEw7Cit9CisKIHN0YXRpYyBjaGFyICoKIGdldF9zdXBwbGljYW50X2Nv bmZpZ192YWx1ZShHSGFzaFRhYmxlICp3c2NvbmYsIGNvbnN0IGNoYXIgKmtleSwgZ2Jvb2xlYW4g dG9fbG93ZXIpCiB7CkBAIC0xNjA0LDggKzE3MDcsOCBAQCByZWFkX3dpcmVsZXNzX2Nvbm5lY3Rp b24oY29uc3QgY2hhciAqICAgIGlmYWNlX3BhdGgsCiAgICAgcmV0dXJuIGNvbm5lY3Rpb247CiB9 CiAKLS8qIE9ubHkgTk1fREVWSUNFX1RZUEVfV0lGSSBhbmQgTk1fREVWSUNFX1RZUEVfRVRIRVJO RVQgYXJlCi0gKiByZWNvZ25pemVkICovCisvKiBPbmx5IE5NX0RFVklDRV9UWVBFX1dJRkksIE5N X0RFVklDRV9UWVBFX0VUSEVSTkVUIGFuZAorICogTk1fREVWSUNFX1RZUEVfVkxBTiBhcmUgcmVj b2duaXplZCAqLwogc3RhdGljIE5NRGV2aWNlVHlwZQogZ2V0X2RldmljZV90eXBlKG9wdGlvbnNf ZmlsZV90ICpvcHRpb25zLCBjb25zdCBjaGFyICppZmFjZV9uYW1lKQogewpAQCAtMTYyNiw2ICsx NzI5LDggQEAgZ2V0X2RldmljZV90eXBlKG9wdGlvbnNfZmlsZV90ICpvcHRpb25zLCBjb25zdCBj aGFyICppZmFjZV9uYW1lKQogICAgICAgICAgICAgZGV2X3R5cGUgPSBvcHRpb25zX3RydWVfdmFs dWUob3B0aW9ucywgIkNPTkZJR19XSVJFTEVTUyIsIEZBTFNFKSA/CiAgICAgICAgICAgICAgICAg ICAgICAgIE5NX0RFVklDRV9UWVBFX1dJRkkgOiBOTV9ERVZJQ0VfVFlQRV9FVEhFUk5FVDsKICAg ICAgICAgfQorICAgIH0gZWxzZSBpZiAoIWdfYXNjaWlfc3RyY2FzZWNtcCgidmxhbiIsIG9wdGlv bnMtPnR5cGUpKSB7CisgICAgICAgIGRldl90eXBlID0gTk1fREVWSUNFX1RZUEVfVkxBTjsKICAg ICB9CiAKICAgICByZXR1cm4gZGV2X3R5cGU7CkBAIC0xNjk3LDYgKzE4MDIsOSBAQCByZWFkX2Nv bm5lY3Rpb24oY29uc3QgY2hhciAqIGlmYWNlX3BhdGgsCiAgICAgICAgIGNvbm5lY3Rpb24gPQog ICAgICAgICAgICAgcmVhZF93aXJlbGVzc19jb25uZWN0aW9uKGlmYWNlX3BhdGgsIG9wdGlvbnMs IHdzY29uZiwgZXJyb3IpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIE5NX0RFVklDRV9UWVBF X1ZMQU46CisgICAgICAgIGNvbm5lY3Rpb24gPSByZWFkX3ZsYW5fY29ubmVjdGlvbihpZmFjZV9w YXRoLCBvcHRpb25zLCBlcnJvcik7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAg ICAgIFBMVUdJTl9TRVRfRVJST1IoZXJyb3IsCiAgICAgICAgICAgICAgICAgICAgICAgICAgIkNv bm5lY3Rpb24gZm9yICVzIDogVW5rbm93biBkZXZpY2UgdHlwZSIsCmRpZmYgLS1naXQgYS9zcmMv Y29yZS9zZXR0aW5ncy9wbHVnaW5zL2V0Y25ldC1hbHQvdGVzdHMvaWZhY2VzLWNvbmZpZy9lbnMx OS4xMDAvaXB2NGFkZHJlc3MgYi9zcmMvY29yZS9zZXR0aW5ncy9wbHVnaW5zL2V0Y25ldC1hbHQv dGVzdHMvaWZhY2VzLWNvbmZpZy9lbnMxOS4xMDAvaXB2NGFkZHJlc3MKbmV3IGZpbGUgbW9kZSAx MDA2NDQKLS0tIC9kZXYvbnVsbAorKysgYi9zcmMvY29yZS9zZXR0aW5ncy9wbHVnaW5zL2V0Y25l dC1hbHQvdGVzdHMvaWZhY2VzLWNvbmZpZy9lbnMxOS4xMDAvaXB2NGFkZHJlc3MKQEAgLTAsMCAr MSBAQAorMTkyLjE2OC4wLjEvMjQKZGlmZiAtLWdpdCBhL3NyYy9jb3JlL3NldHRpbmdzL3BsdWdp bnMvZXRjbmV0LWFsdC90ZXN0cy9pZmFjZXMtY29uZmlnL2VuczE5LjEwMC9vcHRpb25zIGIvc3Jj L2NvcmUvc2V0dGluZ3MvcGx1Z2lucy9ldGNuZXQtYWx0L3Rlc3RzL2lmYWNlcy1jb25maWcvZW5z MTkuMTAwL29wdGlvbnMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMC4uMTEx MTExMTExMQotLS0gL2Rldi9udWxsCisrKyBiL3NyYy9jb3JlL3NldHRpbmdzL3BsdWdpbnMvZXRj bmV0LWFsdC90ZXN0cy9pZmFjZXMtY29uZmlnL2VuczE5LjEwMC9vcHRpb25zCkBAIC0wLDAgKzEs MTIgQEAKK1RZUEU9dmxhbgorSE9TVD1lbnMxOQorVklEPTEwMAorT05CT09UPXllcworQ09ORklH X1dJUkVMRVNTPW5vCitDT05GSUdfSVBWND15ZXMKK0NPTkZJR19JUFY2PW5vCitCT09UUFJPVE89 c3RhdGljCitTWVNURU1EX0JPT1RQUk9UTz1zdGF0aWMKK0RJU0FCTEVEPXllcworTk1fQ09OVFJP TExFRD15ZXMKK1NZU1RFTURfQ09OVFJPTExFRD1ubwpkaWZmIC0tZ2l0IGEvc3JjL2NvcmUvc2V0 dGluZ3MvcGx1Z2lucy9ldGNuZXQtYWx0L3Rlc3RzL2lmYWNlcy1jb25maWcvZW5zMTkuMjAwL29w dGlvbnMgYi9zcmMvY29yZS9zZXR0aW5ncy9wbHVnaW5zL2V0Y25ldC1hbHQvdGVzdHMvaWZhY2Vz LWNvbmZpZy9lbnMxOS4yMDAvb3B0aW9ucwpuZXcgZmlsZSBtb2RlIDEwMDY0NAotLS0gL2Rldi9u dWxsCisrKyBiL3NyYy9jb3JlL3NldHRpbmdzL3BsdWdpbnMvZXRjbmV0LWFsdC90ZXN0cy9pZmFj ZXMtY29uZmlnL2VuczE5LjIwMC9vcHRpb25zCkBAIC0wLDAgKzEsOCBAQAorVFlQRT12bGFuCitI T1NUPWVuczE5CitWSUQ9MjAwCitPTkJPT1Q9eWVzCitDT05GSUdfSVBWND1ubworQ09ORklHX0lQ VjY9bm8KK05NX0NPTlRST0xMRUQ9eWVzCitTWVNURU1EX0NPTlRST0xMRUQ9bm8KZGlmZiAtLWdp dCBhL3NyYy9jb3JlL3NldHRpbmdzL3BsdWdpbnMvZXRjbmV0LWFsdC90ZXN0cy90ZXN0LWV0Y25l dC1hbHQuYyBiL3NyYy9jb3JlL3NldHRpbmdzL3BsdWdpbnMvZXRjbmV0LWFsdC90ZXN0cy90ZXN0 LWV0Y25ldC1hbHQuYwotLS0gYS9zcmMvY29yZS9zZXR0aW5ncy9wbHVnaW5zL2V0Y25ldC1hbHQv dGVzdHMvdGVzdC1ldGNuZXQtYWx0LmMKKysrIGIvc3JjL2NvcmUvc2V0dGluZ3MvcGx1Z2lucy9l dGNuZXQtYWx0L3Rlc3RzL3Rlc3QtZXRjbmV0LWFsdC5jCkBAIC0yOCw2ICsyOCw4IEBACiAjZGVm aW5lIFRFU1RfQ09ORklHX1dJUkVMRVNTX0RIQ1AgVEVTVF9DT05GSUdTX0RJUiAiL2lmYWNlcy1j b25maWcvd2wiCiAjZGVmaW5lIFRFU1RfQ09ORklHX0lQVjYgICAgICAgICAgVEVTVF9DT05GSUdT X0RJUiAiL2lmYWNlcy1jb25maWcvaXB2NiIKICNkZWZpbmUgVEVTVF9DT05GSUdfQlJJREdFICAg ICAgICBURVNUX0NPTkZJR1NfRElSICIvaWZhY2VzLWNvbmZpZy9icmlkZ2UiCisjZGVmaW5lIFRF U1RfQ09ORklHX1ZMQU5fU1RBVElDICAgVEVTVF9DT05GSUdTX0RJUiAiL2lmYWNlcy1jb25maWcv ZW5zMTkuMTAwIgorI2RlZmluZSBURVNUX0NPTkZJR19WTEFOX0wyICAgICAgIFRFU1RfQ09ORklH U19ESVIgIi9pZmFjZXMtY29uZmlnL2VuczE5LjIwMCIKIAogc3RhdGljIHZvaWQKIHZlcmlmeV9z ZXR0aW5nX2Nvbm5lY3Rpb24oTk1TZXR0aW5nQ29ubmVjdGlvbiAqc19jb24sIGNvbnN0IGNoYXIg KmV4cGVjdGVkX2lkLApAQCAtMTQ3NSw2ICsxNDc2LDk5IEBAIHRlc3RfcmVhZF9icmlkZ2VfaWdu b3JlZCh2b2lkKQogICAgIHRlc3RfcmVhZF9icmlkZ2UoVEVTVF9DT05GSUdfQlJJREdFLCBOVUxM LCBUUlVFLCBUUlVFLCAiU3lzdGVtIGJyaWRnZSIpOwogfQogCitzdGF0aWMgdm9pZAordGVzdF9y ZWFkX3ZsYW4oY29uc3QgY2hhciAqICAgICAgICAgICAgIGlmYWNlX3BhdGgsCisgICAgICAgICAg ICAgICBjb25zdCBjaGFyICogICAgICAgICAgICAgZXhwZWN0ZWRfaWQsCisgICAgICAgICAgICAg ICBjb25zdCBjaGFyICogICAgICAgICAgICAgZXhwZWN0ZWRfaWZhY2VfbmFtZSwKKyAgICAgICAg ICAgICAgIGd1aW50MzIgICAgICAgICAgICAgICAgICBleHBlY3RlZF92aWQsCisgICAgICAgICAg ICAgICBjb25zdCBjaGFyICogICAgICAgICAgICAgZXhwZWN0ZWRfaXB2NF9tZXRob2QsCisgICAg ICAgICAgICAgICBndWludDMyICAgICAgICAgICAgICAgICAgZXhwZWN0ZWRfbnVtX2lwdjRhZGRy LAorICAgICAgICAgICAgICAgY29uc3QgdGVzdF9pcF9hZGRyZXNzX3QgKmV4cGVjdGVkX2lwdjRh ZGRyZXNzZXMpCit7CisgICAgTk1Db25uZWN0aW9uICogICAgICAgY29ubmVjdGlvbjsKKyAgICBO TVNldHRpbmdDb25uZWN0aW9uICpzX2NvbjsKKyAgICBOTVNldHRpbmdWbGFuICogICAgICBzX3Zs YW47CisgICAgTk1TZXR0aW5nSVBDb25maWcgKiAgc19pcDQ7CisgICAgTk1TZXR0aW5nSVBDb25m aWcgKiAgc19pcDY7CisgICAgR0Vycm9yICogICAgICAgICAgICAgZXJyb3IgICA9IE5VTEw7Cisg ICAgZ2Jvb2xlYW4gICAgICAgICAgICAgaWdub3JlZCA9IFRSVUU7CisKKyAgICBjb25uZWN0aW9u ID0gcmVhZF9jb25uZWN0aW9uKGlmYWNlX3BhdGgsIE5VTEwsICZpZ25vcmVkLCAmZXJyb3IpOwor CisgICAgZ19hc3NlcnRfZmFsc2UoaWdub3JlZCk7CisgICAgZ19hc3NlcnRfbm9fZXJyb3IoZXJy b3IpOworICAgIGdfYXNzZXJ0KGNvbm5lY3Rpb24pOworICAgIG5tdHN0X2Fzc2VydF9jb25uZWN0 aW9uX3ZlcmlmaWVzKGNvbm5lY3Rpb24pOworCisgICAgc19jb24gPSBubV9jb25uZWN0aW9uX2dl dF9zZXR0aW5nX2Nvbm5lY3Rpb24oY29ubmVjdGlvbik7CisgICAgdmVyaWZ5X3NldHRpbmdfY29u bmVjdGlvbihzX2NvbiwgZXhwZWN0ZWRfaWQsIFRSVUUpOworICAgIGdfYXNzZXJ0X2NtcHN0cihu bV9zZXR0aW5nX2Nvbm5lY3Rpb25fZ2V0X2Nvbm5lY3Rpb25fdHlwZShzX2NvbiksCisgICAgICAg ICAgICAgICAgICAgID09LAorICAgICAgICAgICAgICAgICAgICBOTV9TRVRUSU5HX1ZMQU5fU0VU VElOR19OQU1FKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIobm1fc2V0dGluZ19jb25uZWN0aW9uX2dl dF9pbnRlcmZhY2VfbmFtZShzX2NvbiksID09LCBleHBlY3RlZF9pZmFjZV9uYW1lKTsKKworICAg IHNfdmxhbiA9IG5tX2Nvbm5lY3Rpb25fZ2V0X3NldHRpbmdfdmxhbihjb25uZWN0aW9uKTsKKyAg ICBnX2Fzc2VydChzX3ZsYW4pOworICAgIGdfYXNzZXJ0X2NtcHN0cihubV9zZXR0aW5nX3ZsYW5f Z2V0X3BhcmVudChzX3ZsYW4pLCA9PSwgImVuczE5Iik7CisgICAgZ19hc3NlcnRfY21wdWludChu bV9zZXR0aW5nX3ZsYW5fZ2V0X2lkKHNfdmxhbiksID09LCBleHBlY3RlZF92aWQpOworCisgICAg c19pcDQgPSBubV9jb25uZWN0aW9uX2dldF9zZXR0aW5nX2lwNF9jb25maWcoY29ubmVjdGlvbik7 CisgICAgdmVyaWZ5X3NldHRpbmdfaXAoc19pcDQsCisgICAgICAgICAgICAgICAgICAgICAgZXhw ZWN0ZWRfaWQsCisgICAgICAgICAgICAgICAgICAgICAgZXhwZWN0ZWRfaXB2NF9tZXRob2QsCisg ICAgICAgICAgICAgICAgICAgICAgZXhwZWN0ZWRfbnVtX2lwdjRhZGRyLAorICAgICAgICAgICAg ICAgICAgICAgIGV4cGVjdGVkX2lwdjRhZGRyZXNzZXMsCisgICAgICAgICAgICAgICAgICAgICAg TlVMTCwKKyAgICAgICAgICAgICAgICAgICAgICAwLAorICAgICAgICAgICAgICAgICAgICAgIE5V TEwsCisgICAgICAgICAgICAgICAgICAgICAgMCwKKyAgICAgICAgICAgICAgICAgICAgICBOVUxM LAorICAgICAgICAgICAgICAgICAgICAgIDAsCisgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7 CisKKyAgICBzX2lwNiA9IG5tX2Nvbm5lY3Rpb25fZ2V0X3NldHRpbmdfaXA2X2NvbmZpZyhjb25u ZWN0aW9uKTsKKyAgICB2ZXJpZnlfc2V0dGluZ19pcChzX2lwNiwKKyAgICAgICAgICAgICAgICAg ICAgICBleHBlY3RlZF9pZCwKKyAgICAgICAgICAgICAgICAgICAgICBOTV9TRVRUSU5HX0lQNl9D T05GSUdfTUVUSE9EX0lHTk9SRSwKKyAgICAgICAgICAgICAgICAgICAgICAwLAorICAgICAgICAg ICAgICAgICAgICAgIE5VTEwsCisgICAgICAgICAgICAgICAgICAgICAgTlVMTCwKKyAgICAgICAg ICAgICAgICAgICAgICAwLAorICAgICAgICAgICAgICAgICAgICAgIE5VTEwsCisgICAgICAgICAg ICAgICAgICAgICAgMCwKKyAgICAgICAgICAgICAgICAgICAgICBOVUxMLAorICAgICAgICAgICAg ICAgICAgICAgIDAsCisgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7CisKKyAgICBnX29iamVj dF91bnJlZihjb25uZWN0aW9uKTsKK30KKworc3RhdGljIHZvaWQKK3Rlc3RfcmVhZF92bGFuX3N0 YXRpYyh2b2lkKQoreworICAgIGNvbnN0IHRlc3RfaXBfYWRkcmVzc190IGFkZHJlc3Nlc1sxXSA9 IHt7IjE5Mi4xNjguMC4xIiwgMjR9fTsKKworICAgIHRlc3RfcmVhZF92bGFuKFRFU1RfQ09ORklH X1ZMQU5fU1RBVElDLAorICAgICAgICAgICAgICAgICAgICJTeXN0ZW0gZW5zMTkuMTAwIiwKKyAg ICAgICAgICAgICAgICAgICAiZW5zMTkuMTAwIiwKKyAgICAgICAgICAgICAgICAgICAxMDAsCisg ICAgICAgICAgICAgICAgICAgTk1fU0VUVElOR19JUDRfQ09ORklHX01FVEhPRF9NQU5VQUwsCisg ICAgICAgICAgICAgICAgICAgMSwKKyAgICAgICAgICAgICAgICAgICBhZGRyZXNzZXMpOworfQor CitzdGF0aWMgdm9pZAordGVzdF9yZWFkX3ZsYW5fbDIodm9pZCkKK3sKKyAgICB0ZXN0X3JlYWRf dmxhbihURVNUX0NPTkZJR19WTEFOX0wyLAorICAgICAgICAgICAgICAgICAgICJTeXN0ZW0gZW5z MTkuMjAwIiwKKyAgICAgICAgICAgICAgICAgICAiZW5zMTkuMjAwIiwKKyAgICAgICAgICAgICAg ICAgICAyMDAsCisgICAgICAgICAgICAgICAgICAgTk1fU0VUVElOR19JUDRfQ09ORklHX01FVEhP RF9ESVNBQkxFRCwKKyAgICAgICAgICAgICAgICAgICAwLAorICAgICAgICAgICAgICAgICAgIE5V TEwpOworfQorCiBzdGF0aWMgdm9pZAogdGVzdF9yZWFkX2V0aF9kaGNwX25vX3R5cGUodm9pZCkK IHsKQEAgLTE1MzMsNiArMTYxMCw5IEBAIG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCiAg ICAgZ190ZXN0X2FkZF9mdW5jKFRQQVRIICJ0ZXN0X3JlYWRfYnJpZGdlX2lnbm9yZWQiLCB0ZXN0 X3JlYWRfYnJpZGdlX2lnbm9yZWQpOwogCisgICAgZ190ZXN0X2FkZF9mdW5jKFRQQVRIICJ0ZXN0 X3JlYWRfdmxhbl9zdGF0aWMiLCB0ZXN0X3JlYWRfdmxhbl9zdGF0aWMpOworICAgIGdfdGVzdF9h ZGRfZnVuYyhUUEFUSCAidGVzdF9yZWFkX3ZsYW5fbDIiLCB0ZXN0X3JlYWRfdmxhbl9sMik7CisK ICAgICBnX3Rlc3RfYWRkX2Z1bmMoVFBBVEggInRlc3RfcmVhZF9ldGhfZGhjcF9ub190eXBlIiwg dGVzdF9yZWFkX2V0aF9kaGNwX25vX3R5cGUpOwogCiAgICAgcmV0dXJuIGdfdGVzdF9ydW4oKTsK