From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-0.2 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_NXDOMAIN autolearn=no autolearn_force=no version=3.4.4 Received: (qmail 28106 invoked from network); 22 Dec 2020 14:55:17 -0000 Received: from localhost (HELO inbox.vuxu.org) (::1) by localhost with ESMTPUTF8; 22 Dec 2020 14:55:17 -0000 Content-Type: multipart/mixed; boundary="===============5938254944213720280==" MIME-Version: 1.0 Subject: =?utf8?q?=5BPR_PATCH=5D_lxc=3A_fix_config_parsing_with_linux5=2E10?= To: ml@inbox.vuxu.org From: ahesford Reply-to: ml@inbox.vuxu.org Message-ID: Date: Tue, 22 Dec 2020 15:55:15 +0100 List-Id: GitHub notification mails are now in MIME to allow UTF8. --===============5938254944213720280== Content-Type: text/plain; charset="utf8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 VGhlcmUgaXMgYSBuZXcgcHVsbCByZXF1ZXN0IGJ5IGFoZXNmb3JkIGFnYWluc3QgbWFzdGVyIG9u IHRoZSB2b2lkLXBhY2thZ2VzIHJlcG9zaXRvcnkKCmh0dHBzOi8vZ2l0aHViLmNvbS9haGVzZm9y ZC92b2lkLXBhY2thZ2VzIGx4YwpodHRwczovL2dpdGh1Yi5jb20vdm9pZC1saW51eC92b2lkLXBh Y2thZ2VzL3B1bGwvMjczNTIKCmx4YzogZml4IGNvbmZpZyBwYXJzaW5nIHdpdGggbGludXg1LjEw CldoZW4gdXBncmFkaW5nIHRvIGBsaW51eDUuMTBgLCBJIG5vdGljZWQgdGhhdCBMWEMgZmFpbGVk IHRvIHBhcnNlIGNvbmZpZ3MsIGNvbXBsYWluaW5nIGFib3V0IGEgZmFpbHVyZSBpbiBgc2VuZGZp bGUoMilgLiBJIHdhcyB1bmFibGUgdG8gc3RhcnQgZXhpc3RpbmcgY29udGFpbmVycyBvciBjcmVh dGUgbmV3IG9uZXMuIFVwc3RyZWFtIGNvbW1pdCBseGMvbHhjQDI2ZGZmZDgyNTg0MmVkZjAxOWJj MTdkYTI0YTY4MDllZDUxYzA0OGMgYWxyZWFkeSBhZGRyZXNzZXMgdGhpcywgZHJvcHBpbmcgdXNl IG9mIGBzZW5kZmlsZWAgaW4gdGhlIGNvbmZpZyBwYXJzZXIgYWx0b2dldGhlci4NCg0KQENhbWVy b25OZW1vLCBkbyB5b3UgaGF2ZSBhbnkgb2JqZWN0aW9ucyB0byBpbmNsdWRpbmcgdGhpcyBwYXRj aD8KCkEgcGF0Y2ggZmlsZSBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS92b2lkLWxpbnV4L3ZvaWQt cGFja2FnZXMvcHVsbC8yNzM1Mi5wYXRjaCBpcyBhdHRhY2hlZA== --===============5938254944213720280== Content-Type: text/x-diff MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="github-pr-lxc-27352.patch" RnJvbSA3ZWZlODM4ODIyZGJkNDg0Mjk4NjNhNjI1YTU3Njk2MGZmODVmZTZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiQW5kcmV3IEouIEhlc2ZvcmQiIDxhamhAc2lkZWJhbmQub3Jn PgpEYXRlOiBUdWUsIDIyIERlYyAyMDIwIDA5OjQ0OjU4IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0g bHhjOiBmaXggY29uZmlnIHBhcnNpbmcgd2l0aCBsaW51eDUuMTAKCi0tLQogc3JjcGtncy9seGMv cGF0Y2hlcy9maXgtY29uZmlnLXBhcnNpbmcucGF0Y2ggfCAxNjkgKysrKysrKysrKysrKysrKysr Kwogc3JjcGtncy9seGMvdGVtcGxhdGUgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIgKy0K IDIgZmlsZXMgY2hhbmdlZCwgMTcwIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKIGNyZWF0 ZSBtb2RlIDEwMDY0NCBzcmNwa2dzL2x4Yy9wYXRjaGVzL2ZpeC1jb25maWctcGFyc2luZy5wYXRj aAoKZGlmZiAtLWdpdCBhL3NyY3BrZ3MvbHhjL3BhdGNoZXMvZml4LWNvbmZpZy1wYXJzaW5nLnBh dGNoIGIvc3JjcGtncy9seGMvcGF0Y2hlcy9maXgtY29uZmlnLXBhcnNpbmcucGF0Y2gKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLmNiYjQzNWMzZTRhCi0tLSAvZGV2L251 bGwKKysrIGIvc3JjcGtncy9seGMvcGF0Y2hlcy9maXgtY29uZmlnLXBhcnNpbmcucGF0Y2gKQEAg LTAsMCArMSwxNjkgQEAKK0Zyb20gMjZkZmZkODI1ODQyZWRmMDE5YmMxN2RhMjRhNjgwOWVkNTFj MDQ4YyBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206IENocmlzdGlhbiBCcmF1bmVyIDxj aHJpc3RpYW4uYnJhdW5lckB1YnVudHUuY29tPgorRGF0ZTogTW9uLCAxNiBOb3YgMjAyMCAxMjox ODoxNCArMDEwMAorU3ViamVjdDogW1BBVENIXSBwYXJzZTogcmV3b3JrIGNvbmZpZyBwYXJzaW5n IHJvdXRpbmUKKworU2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFuIEJyYXVuZXIgPGNocmlzdGlhbi5i cmF1bmVyQHVidW50dS5jb20+CistLS0KKyBzcmMvbHhjL2ZpbGVfdXRpbHMuYyB8ICA3ICsrKysr LS0KKyBzcmMvbHhjL2ZpbGVfdXRpbHMuaCB8ICA2ICsrKysrLQorIHNyYy9seGMvcGFyc2UuYyAg ICAgIHwgNDkgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyAz IGZpbGVzIGNoYW5nZWQsIDM3IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQorCitkaWZm IC0tZ2l0IHNyYy9seGMvZmlsZV91dGlscy5jIHNyYy9seGMvZmlsZV91dGlscy5jCitpbmRleCBm YWZhYmEzNTRjLi4zYjRiZmZiMzk5IDEwMDY0NAorLS0tIHNyYy9seGMvZmlsZV91dGlscy5jCisr Kysgc3JjL2x4Yy9maWxlX3V0aWxzLmMKK0BAIC0zODIsOCArMzgyLDEwIEBAIHNzaXplX3QgbHhj X3NlbmRmaWxlX25vaW50cihpbnQgb3V0X2ZkLCBpbnQgaW5fZmQsIG9mZl90ICpvZmZzZXQsIHNp emVfdCBjb3VudCkKKyAJcmV0dXJuIHJldDsKKyB9CisgCistaW50IGZkX3RvX2ZkKGludCBmcm9t LCBpbnQgdG8pCisrc3NpemVfdCBfX2ZkX3RvX2ZkKGludCBmcm9tLCBpbnQgdG8pCisgeworKwlz c2l6ZV90IHRvdGFsX2J5dGVzID0gMDsKKysKKyAJZm9yICg7OykgeworIAkJdWludDhfdCBidWZb UEFUSF9NQVhdOworIAkJdWludDhfdCAqcCA9IGJ1ZjsKK0BAIC00MDcsOSArNDA5LDEwIEBAIGlu dCBmZF90b19mZChpbnQgZnJvbSwgaW50IHRvKQorIAkJCWJ5dGVzX3RvX3dyaXRlIC09IGJ5dGVz X3dyaXR0ZW47CisgCQkJcCArPSBieXRlc193cml0dGVuOworIAkJfSB3aGlsZSAoYnl0ZXNfdG9f d3JpdGUgPiAwKTsKKysJCXRvdGFsX2J5dGVzICs9IGJ5dGVzX3RvX3dyaXRlOworIAl9CisgCist CXJldHVybiAwOworKwlyZXR1cm4gdG90YWxfYnl0ZXM7CisgfQorIAorIGludCBmZF90b19idWYo aW50IGZkLCBjaGFyICoqYnVmLCBzaXplX3QgKmxlbmd0aCkKK2RpZmYgLS1naXQgc3JjL2x4Yy9m aWxlX3V0aWxzLmggc3JjL2x4Yy9maWxlX3V0aWxzLmgKK2luZGV4IGVhOTU3MGRkMTguLjExYWNk YjNhN2IgMTAwNjQ0CistLS0gc3JjL2x4Yy9maWxlX3V0aWxzLmgKKysrKyBzcmMvbHhjL2ZpbGVf dXRpbHMuaAorQEAgLTY4LDcgKzY4LDExIEBAIF9faGlkZGVuIGV4dGVybiBGSUxFICpmb3Blbl9j bG9leGVjKGNvbnN0IGNoYXIgKnBhdGgsIGNvbnN0IGNoYXIgKm1vZGUpOworIF9faGlkZGVuIGV4 dGVybiBzc2l6ZV90IGx4Y19zZW5kZmlsZV9ub2ludHIoaW50IG91dF9mZCwgaW50IGluX2ZkLCBv ZmZfdCAqb2Zmc2V0LCBzaXplX3QgY291bnQpOworIF9faGlkZGVuIGV4dGVybiBjaGFyICpmaWxl X3RvX2J1Zihjb25zdCBjaGFyICpwYXRoLCBzaXplX3QgKmxlbmd0aCk7CisgX19oaWRkZW4gZXh0 ZXJuIGludCBmZF90b19idWYoaW50IGZkLCBjaGFyICoqYnVmLCBzaXplX3QgKmxlbmd0aCk7Cist X19oaWRkZW4gZXh0ZXJuIGludCBmZF90b19mZChpbnQgZnJvbSwgaW50IHRvKTsKKytfX2hpZGRl biBleHRlcm4gc3NpemVfdCBfX2ZkX3RvX2ZkKGludCBmcm9tLCBpbnQgdG8pOworK3N0YXRpYyBp bmxpbmUgaW50IGZkX3RvX2ZkKGludCBmcm9tLCBpbnQgdG8pCisreworKwlyZXR1cm4gX19mZF90 b19mZChmcm9tLCB0bykgPj0gMDsKKyt9CisgX19oaWRkZW4gZXh0ZXJuIGludCBseGNfb3Blbl9k aXJmZChjb25zdCBjaGFyICpkaXIpOworIF9faGlkZGVuIGV4dGVybiBGSUxFICpmZG9wZW5fY2Fj aGVkKGludCBmZCwgY29uc3QgY2hhciAqbW9kZSwgdm9pZCAqKmNhbGxlcl9mcmVlZF9idWZmZXIp OworIF9faGlkZGVuIGV4dGVybiBGSUxFICpmb3Blbl9jYWNoZWQoY29uc3QgY2hhciAqcGF0aCwg Y29uc3QgY2hhciAqbW9kZSwgdm9pZCAqKmNhbGxlcl9mcmVlZF9idWZmZXIpOworZGlmZiAtLWdp dCBzcmMvbHhjL3BhcnNlLmMgc3JjL2x4Yy9wYXJzZS5jCitpbmRleCAyOTFiZjNlZmMxLi41YTVi ODUzNDU4IDEwMDY0NAorLS0tIHNyYy9seGMvcGFyc2UuYworKysrIHNyYy9seGMvcGFyc2UuYwor QEAgLTUsNiArNSw3IEBACisgI2VuZGlmCisgI2luY2x1ZGUgPGRpcmVudC5oPgorICNpbmNsdWRl IDxlcnJuby5oPgorKyNpbmNsdWRlIDxsaW1pdHMuaD4KKyAjaW5jbHVkZSA8c3RkaW8uaD4KKyAj aW5jbHVkZSA8c3RkbGliLmg+CisgI2luY2x1ZGUgPHN0cmluZy5oPgorQEAgLTUwLDExICs1MSwx MiBAQCBpbnQgbHhjX3N0cm11bm1hcCh2b2lkICphZGRyLCBzaXplX3QgbGVuZ3RoKQorIAorIGlu dCBseGNfZmlsZV9mb3JfZWFjaF9saW5lX21tYXAoY29uc3QgY2hhciAqZmlsZSwgbHhjX2ZpbGVf Y2IgY2FsbGJhY2ssIHZvaWQgKmRhdGEpCisgeworLQlpbnQgc2F2ZWRfZXJybm87CistCXNzaXpl X3QgcmV0ID0gLTEsIGJ5dGVzX3NlbnQ7CistCWNoYXIgKmxpbmU7CistCWludCBmZCA9IC0xLCBt ZW1mZCA9IC0xOworKwlfX2RvX2Nsb3NlIGludCBmZCA9IC1FQkFERiwgbWVtZmQgPSAtRUJBREY7 CisrCXNzaXplX3QgcmV0ID0gLTE7CisgCWNoYXIgKmJ1ZiA9IE5VTEw7CisrCXN0cnVjdCBzdGF0 IHN0ID0ge307CisrCXNzaXplX3QgYnl0ZXM7CisrCWNoYXIgKmxpbmU7CisgCisgCW1lbWZkID0g bWVtZmRfY3JlYXRlKCIubHhjX2NvbmZpZ19maWxlIiwgTUZEX0NMT0VYRUMpOworIAlpZiAobWVt ZmQgPCAwKSB7CitAQCAtNjUsOCArNjcsNyBAQCBpbnQgbHhjX2ZpbGVfZm9yX2VhY2hfbGluZV9t bWFwKGNvbnN0IGNoYXIgKmZpbGUsIGx4Y19maWxlX2NiIGNhbGxiYWNrLCB2b2lkICpkYQorIAkJ CWdvdG8gb25fZXJyb3I7CisgCQl9CisgCistCQlUUkFDRSgiRmFpbGVkIHRvIGNyZWF0ZSBpbi1t ZW1vcnkgZmlsZS4gRmFsbGluZyBiYWNrIHRvICIKKy0JCSAgICAgICJ0ZW1wb3JhcnkgZmlsZSIp OworKwkJVFJBQ0UoIkZhaWxlZCB0byBjcmVhdGUgaW4tbWVtb3J5IGZpbGUuIEZhbGxpbmcgYmFj ayB0byB0ZW1wb3JhcnkgZmlsZSIpOworIAkJbWVtZmQgPSBseGNfbWFrZV90bXBmaWxlKHRlbXBs YXRlLCB0cnVlKTsKKyAJCWlmIChtZW1mZCA8IDApIHsKKyAJCQlTWVNFUlJPUigiRmFpbGVkIHRv IGNyZWF0ZSB0ZW1wb3JhcnkgZmlsZSBcIiVzXCIiLCB0ZW1wbGF0ZSk7CitAQCAtODAsMTAgKzgx LDIxIEBAIGludCBseGNfZmlsZV9mb3JfZWFjaF9saW5lX21tYXAoY29uc3QgY2hhciAqZmlsZSwg bHhjX2ZpbGVfY2IgY2FsbGJhY2ssIHZvaWQgKmRhCisgCQlnb3RvIG9uX2Vycm9yOworIAl9Cisg CistCS8qIHNlbmRmaWxlKCkgaGFuZGxlcyB1cCB0byAyR0IuIE5vIGNvbmZpZyBmaWxlIHNob3Vs ZCBiZSB0aGF0IGJpZy4gKi8KKy0JYnl0ZXNfc2VudCA9IGx4Y19zZW5kZmlsZV9ub2ludHIobWVt ZmQsIGZkLCBOVUxMLCBMWENfU0VOREZJTEVfTUFYKTsKKy0JaWYgKGJ5dGVzX3NlbnQgPCAwKSB7 CistCQlTWVNFUlJPUigiRmFpbGVkIHRvIHNlbmRmaWxlIFwiJXNcIiIsIGZpbGUpOworKwlyZXQg PSBmc3RhdChmZCwgJnN0KTsKKysJaWYgKHJldCkgeworKwkJU1lTRVJST1IoIkZhaWxlZCB0byBz dGF0IGZpbGUgXCIlc1wiIiwgZmlsZSk7CisrCQlnb3RvIG9uX2Vycm9yOworKwl9CisrCisrCWlm IChzdC5zdF9zaXplID4gSU5UX01BWCkgeworKwkJU1lTRVJST1IoIkV4Y2Vzc2l2ZWx5IGxhcmdl IGNvbmZpZyBmaWxlIFwiJXNcIiIsIGZpbGUpOworKwkJZ290byBvbl9lcnJvcjsKKysJfQorKwor KworKwlieXRlcyA9IF9fZmRfdG9fZmQoZmQsIG1lbWZkKTsKKysJaWYgKGJ5dGVzIDwgMCkgewor KwkJU1lTRVJST1IoIkZhaWxlZCB0byBjb3B5IGNvbmZpZyBmaWxlIFwiJXNcIiIsIGZpbGUpOwor IAkJZ290byBvbl9lcnJvcjsKKyAJfQorIAorQEAgLTkyLDcgKzEwNCw3IEBAIGludCBseGNfZmls ZV9mb3JfZWFjaF9saW5lX21tYXAoY29uc3QgY2hhciAqZmlsZSwgbHhjX2ZpbGVfY2IgY2FsbGJh Y2ssIHZvaWQgKmRhCisgCQlTWVNFUlJPUigiRmFpbGVkIHRvIGFwcGVuZCB6ZXJvIGJ5dGUiKTsK KyAJCWdvdG8gb25fZXJyb3I7CisgCX0KKy0JYnl0ZXNfc2VudCsrOworKwlieXRlcysrOworIAor IAlyZXQgPSBsc2VlayhtZW1mZCwgMCwgU0VFS19TRVQpOworIAlpZiAocmV0IDwgMCkgeworQEAg LTEwMSw4ICsxMTMsNyBAQCBpbnQgbHhjX2ZpbGVfZm9yX2VhY2hfbGluZV9tbWFwKGNvbnN0IGNo YXIgKmZpbGUsIGx4Y19maWxlX2NiIGNhbGxiYWNrLCB2b2lkICpkYQorIAl9CisgCisgCXJldCA9 IC0xOworLQlidWYgPSBtbWFwKE5VTEwsIGJ5dGVzX3NlbnQsIFBST1RfUkVBRCB8IFBST1RfV1JJ VEUsCistCQkgICBNQVBfU0hBUkVEIHwgTUFQX1BPUFVMQVRFLCBtZW1mZCwgMCk7CisrCWJ1ZiA9 IG1tYXAoTlVMTCwgYnl0ZXMsIFBST1RfUkVBRCB8IFBST1RfV1JJVEUsIE1BUF9QUklWQVRFIHwg TUFQX1BPUFVMQVRFLCBtZW1mZCwgMCk7CisgCWlmIChidWYgPT0gTUFQX0ZBSUxFRCkgeworIAkJ YnVmID0gTlVMTDsKKyAJCVNZU0VSUk9SKCJGYWlsZWQgdG8gbW1hcCIpOworQEAgLTExNywyNCAr MTI4LDE4IEBAIGludCBseGNfZmlsZV9mb3JfZWFjaF9saW5lX21tYXAoY29uc3QgY2hhciAqZmls ZSwgbHhjX2ZpbGVfY2IgY2FsbGJhY2ssIHZvaWQgKmRhCisgCQkJICogZXJyb3IuCisgCQkJICov CisgCQkJaWYgKHJldCA8IDApCistCQkJCUVSUk9SKCJGYWlsZWQgdG8gcGFyc2UgY29uZmlnIGZp bGUgXCIlc1wiIGF0ICIKKy0JCQkJICAgICAgImxpbmUgXCIlc1wiIiwgZmlsZSwgbGluZSk7Cisr CQkJCUVSUk9SKCJGYWlsZWQgdG8gcGFyc2UgY29uZmlnIGZpbGUgXCIlc1wiIGF0IGxpbmUgXCIl c1wiIiwKKysJCQkJICAgICAgZmlsZSwgbGluZSk7CisgCQkJYnJlYWs7CisgCQl9CisgCX0KKyAK KyBvbl9lcnJvcjoKKy0Jc2F2ZWRfZXJybm8gPSBlcnJubzsKKy0JaWYgKGZkID49IDApCistCQlj bG9zZShmZCk7CistCWlmIChtZW1mZCA+PSAwKQorLQkJY2xvc2UobWVtZmQpOworLQlpZiAoYnVm ICYmIG11bm1hcChidWYsIGJ5dGVzX3NlbnQpKSB7CisrCWlmIChidWYgJiYgbXVubWFwKGJ1Ziwg Ynl0ZXMpKSB7CisgCQlTWVNFUlJPUigiRmFpbGVkIHRvIHVubWFwIik7CisgCQlpZiAocmV0ID09 IDApCisgCQkJcmV0ID0gLTE7CisgCX0KKy0JZXJybm8gPSBzYXZlZF9lcnJubzsKKyAKKyAJcmV0 dXJuIHJldDsKKyB9CmRpZmYgLS1naXQgYS9zcmNwa2dzL2x4Yy90ZW1wbGF0ZSBiL3NyY3BrZ3Mv bHhjL3RlbXBsYXRlCmluZGV4IDEyODAyNGRjMDM4Li4wM2ZiZWI0MDBmNSAxMDA2NDQKLS0tIGEv c3JjcGtncy9seGMvdGVtcGxhdGUKKysrIGIvc3JjcGtncy9seGMvdGVtcGxhdGUKQEAgLTMsNyAr Myw3IEBAIF9kZXNjPSJMaW51eCBDb250YWluZXJzIgogCiBwa2duYW1lPWx4YwogdmVyc2lvbj00 LjAuNQotcmV2aXNpb249MgorcmV2aXNpb249MwogYnVpbGRfc3R5bGU9Z251LWNvbmZpZ3VyZQog Y29uZmlndXJlX2FyZ3M9Ii0tZW5hYmxlLWRvYyAtLWVuYWJsZS1zZWNjb21wCiAgLS1lbmFibGUt Y2FwYWJpbGl0aWVzIC0tZW5hYmxlLWFwcGFybW9yIC0td2l0aC1kaXN0cm89bm9uZQo= --===============5938254944213720280==--