From mboxrd@z Thu Jan 1 00:00:00 1970 From: M A Young Subject: [PATCH] allow xendomains to work for xl list -l Date: Tue, 9 Apr 2013 21:05:42 +0100 (BST) Message-ID: Mime-Version: 1.0 Content-Type: MULTIPART/MIXED; boundary="8323329-11338345-1365537666=:27316" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Ian Jackson , Ian Campbell , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323329-11338345-1365537666=:27316 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed I have discovered a few problems when using the tools/hotplug/Linux/init.d/xendomains startup script if you use xl instead of xm. >>From xen 4.2 onwards xl list -l gives a JSON format output containing no spaces or line feeds, but the xendomains script expects the older format (of xl in xen 4.1 and xm) of one key-value pair per line. This patch adds a new line after each comma in the output of xl list -l before processing it further, allows there to be not to be a space between the key and value format used by xl list -l and accepts the "Xen saved domain" as a valid header for a saved xen image if xl is being used. Michael Young --8323329-11338345-1365537666=:27316 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=xendomains.patch Content-Transfer-Encoding: BASE64 Content-Description: Content-Disposition: attachment; filename=xendomains.patch QWxsb3cgeGVuZG9tYWlucyBzY3JpcHQgdG8gd29yayB3aXRoIHhsIGxpc3Qg LWwNCg0KVGhpcyBwYXRjaCBpbnNlcnRzIGEgbGluZSBmZWVkIGFmdGVyIGVh Y2ggY29tbWEgaW4gdGhlIG91dHB1dCBmcm9tDQp4bCBsaXN0IC1sLCBhbGxv d3MgdGhlcmUgbm90IHRvIGJlIGEgc3BhY2UgYmV0d2VlbiAibmFtZSIgYW5k ICJkb21pZCIga2V5cw0KYW5kIHRoZWlyIHZhbHVlLCBhbmQgYWNjZXB0cyB0 aGUgIlhlbiBzYXZlZCBkb21haW4iIHZhbHVlIGFzIGEgdmFsaWQgaGVhZGVy DQpmb3IgYSBzYXZlZCB4ZW4gaW1hZ2UgaWYgeGwgaXMgYmVpbmcgdXNlZC4N Cg0KU2lnbmVkLW9mZi1ieTogTWljaGFlbCBZb3VuZyA8bS5hLnlvdW5nQGR1 cmhhbS5hYy51az4NCg0KLS0tIHhlbi00LjIuMi90b29scy9ob3RwbHVnL0xp bnV4L2luaXQuZC94ZW5kb21haW5zLm9yaWcJMjAxMy0wMy0yMSAxNzo1NTo0 Mi4wMDAwMDAwMDAgKzAwMDANCisrKyB4ZW4tNC4yLjIvdG9vbHMvaG90cGx1 Zy9MaW51eC9pbml0LmQveGVuZG9tYWlucwkyMDEzLTA0LTA5IDAwOjA5OjIy Ljc4NDcwMDM2NyArMDEwMA0KQEAgLTIxMiw5ICsyMTIsOSBAQA0KICAgICBl bGlmIFtbICIkMSIgPX4gJyhkb21pZCcgXV07IHRoZW4NCiAgICAgICAgIGlk PSQoZWNobyAkMSB8IHNlZCAtZSAncy9eLiooZG9taWQgXCguKlwpKSQvXDEv JykNCiAgICAgZWxpZiBbWyAiJDEiID1+ICcibmFtZSI6JyBdXTsgdGhlbg0K LSAgICAgICAgbmFtZT0kKGVjaG8gJDEgfCBzZWQgLWUgJ3MvXi4qIm5hbWUi OiAiXCguKlwpIiwkL1wxLycpDQorICAgICAgICBuYW1lPSQoZWNobyAkMSB8 IHNlZCAtZSAncy9eLioibmFtZSI6ICoiXCguKlwpIiwkL1wxLycpDQogICAg IGVsaWYgW1sgIiQxIiA9fiAnImRvbWlkIjonIF1dOyB0aGVuDQotICAgICAg ICBpZD0kKGVjaG8gJDEgfCBzZWQgLWUgJ3MvXi4qImRvbWlkIjogXCguKlwp LCQvXDEvJykNCisgICAgICAgIGlkPSQoZWNobyAkMSB8IHNlZCAtZSAncy9e LioiZG9taWQiOiAqXCguKlwpLCQvXDEvJykNCiAgICAgZmkNCiANCiAgICAg WyAtbiAiJG5hbWUiIC1hIC1uICIkaWQiIF0gJiYgcmV0dXJuIDAgfHwgcmV0 dXJuIDENCkBAIC0yMzMsNyArMjMzLDcgQEANCiAJCVJDPTANCiAJCTs7DQog CWVzYWMNCi0gICAgZG9uZSA8IDwoJENNRCBsaXN0IC1sIHwgZ3JlcCAkTElT VF9HUkVQKQ0KKyAgICBkb25lIDwgPCgkQ01EIGxpc3QgLWwgfCBzZWQgLWUg InMvLC8sXG4vZyIgfCBncmVwICRMSVNUX0dSRVApDQogICAgIHJldHVybiAk UkMNCiB9DQogDQpAQCAtMjU1LDcgKzI1NSw3IEBADQogICAgICAgICBmb3Ig ZG9tIGluICRYRU5ET01BSU5TX1NBVkUvKjsgZG8NCiAgICAgICAgICAgICBp ZiBbIC1mICRkb20gXSA7IHRoZW4NCiAgICAgICAgICAgICAgICAgSEVBREVS PWBoZWFkIC1jIDE2ICRkb20gfCBoZWFkIC1uIDEgMj4gL2Rldi9udWxsYA0K LSAgICAgICAgICAgICAgICBpZiBbICRIRUFERVIgPSAiTGludXhHdWVzdFJl Y29yZCIgXTsgdGhlbg0KKyAgICAgICAgICAgICAgICBpZiBbICIkSEVBREVS IiA9ICJMaW51eEd1ZXN0UmVjb3JkIiBdIHx8IFsgIiRDTUQiID0gInhsIiAt YSAiJEhFQURFUiIgPSAiWGVuIHNhdmVkIGRvbWFpbiIgXTsgdGhlbg0KICAg ICAgICAgICAgICAgICAgICAgZWNobyAtbiAiICR7ZG9tIyMqL30iDQogICAg ICAgICAgICAgICAgICAgICBYTVI9YCRDTUQgcmVzdG9yZSAkZG9tIDI+JjEg MT4vZGV2L251bGxgDQogICAgICAgICAgICAgICAgICAgICAjJENNRCByZXN0 b3JlICRkb20NCkBAIC0zMTUsNyArMzE1LDcgQEANCiAJaWYgdGVzdCAiJHN0 YXRlIiAhPSAiLWItLS1kIiAtYSAiJHN0YXRlIiAhPSAiLS0tLS1kIjsgdGhl bg0KIAkgICAgcmV0dXJuIDE7DQogCWZpDQotICAgIGRvbmUgPCA8KCRDTUQg bGlzdCAtbCB8IGdyZXAgJExJU1RfR1JFUCkNCisgICAgZG9uZSA8IDwoJENN RCBsaXN0IC1sIHwgc2VkIC1lICJzLywvLFxuL2ciIHwgZ3JlcCAkTElTVF9H UkVQKQ0KICAgICByZXR1cm4gMA0KIH0NCiANCkBAIC00NDYsNyArNDQ2LDcg QEANCiAJICAgIGZpDQogCSAgICBraWxsICRXRE9HX1BJRCA+L2Rldi9udWxs IDI+JjENCiAJZmkNCi0gICAgZG9uZSA8IDwoJENNRCBsaXN0IC1sIHwgZ3Jl cCAkTElTVF9HUkVQKQ0KKyAgICBkb25lIDwgPCgkQ01EIGxpc3QgLWwgfCBz ZWQgLWUgInMvLC8sXG4vZyIgfCBncmVwICRMSVNUX0dSRVApDQogDQogICAg ICMgTkIuIHRoaXMgc2h1dHMgZG93biBBTEwgWGVuIGRvbWFpbnMgKHBvbGl0 ZWx5KSwgbm90IGp1c3QgdGhlIG9uZXMgaW4NCiAgICAgIyBBVVRPRElSLyoN CkBAIC00ODMsNyArNDgzLDcgQEANCiAJCXJldHVybiAwDQogCQk7Ow0KIAll c2FjDQotICAgIGRvbmUgPCA8KCRDTUQgbGlzdCAtbCB8IGdyZXAgJExJU1Rf R1JFUCkNCisgICAgZG9uZSA8IDwoJENNRCBsaXN0IC1sIHwgc2VkIC1lICJz LywvLFxuL2ciIHwgZ3JlcCAkTElTVF9HUkVQKQ0KICAgICByZXR1cm4gMQ0K IH0NCiANCg== --8323329-11338345-1365537666=:27316 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --8323329-11338345-1365537666=:27316--