Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MmTEi-0002o8-W2 for mharc-grub-devel@gnu.org; Sat, 12 Sep 2009 10:05:57 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MmTEg-0002ke-8X for grub-devel@gnu.org; Sat, 12 Sep 2009 10:05:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MmTEb-0002c2-AM for grub-devel@gnu.org; Sat, 12 Sep 2009 10:05:53 -0400 Received: from [199.232.76.173] (port=44253 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MmTEa-0002bX-SV for grub-devel@gnu.org; Sat, 12 Sep 2009 10:05:48 -0400 Received: from mail-pz0-f175.google.com ([209.85.222.175]:41117) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MmTEZ-0004l3-7X for grub-devel@gnu.org; Sat, 12 Sep 2009 10:05:47 -0400 Received: by pzk5 with SMTP id 5so1672927pzk.6 for ; Sat, 12 Sep 2009 07:05:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=/ggqu/EDyqyDnDDcqe/42/7/vQX8kj3vlZbWMjxJLV0=; b=Lojbj6GRtbkSue/VxV8jz7V/7/i7Kdozc0kCC8qK+UpVSCF1N3hdxerVKdts8KJ09g xvtZo1933lGpEruan9XgVCphAounTjbOT2NTe1ncCB0tFjgUHrBh3Xb8BP8IUv35zrXr 77mcr46WegmDUKQhTj8i/k/ARfxXbvxQV3H90= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=r7+XligLK6ALeEBmyr8E0lLcp572ixIpXjpkijOJUj1oLeriQrO5dTHYulySypIvhO dIkRB2n9XQhGcOfJIaXCzeFOwzwN+aT/SV+/NcexEa1Q94BxJPPfuTryaH5mf8deleWy +pno3h1U8LXN7jkFH6n6t/c9A/q+70e0q+SWM= MIME-Version: 1.0 Received: by 10.115.113.4 with SMTP id q4mr7678361wam.54.1252764345396; Sat, 12 Sep 2009 07:05:45 -0700 (PDT) Date: Sat, 12 Sep 2009 19:35:45 +0530 Message-ID: From: kashyap garimella To: grub-devel@gnu.org Content-Type: multipart/mixed; boundary=0016e64be862cb6fb8047361ed68 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [PATCH]: Save boot record before writing to the dest_drive X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2009 14:05:55 -0000 --0016e64be862cb6fb8047361ed68 Content-Type: multipart/alternative; boundary=0016e64be862cb6fad047361ed66 --0016e64be862cb6fad047361ed66 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Greetings! I have added the following new features: 1) when grub-setup runs, it automatically stores the areas of (mbr + embed) region, which are overwritten, into the file (in the following specified format) in root directory. 2) grub-setup can restore the stored mbr in the following format back to destination drive: Format: ---------------------------------------------------------------------------= ---------------------- 1st 8 bytes - for embed_region.start [ this is of type grub_uint64_t - 8bytes for sure] next 8 bytes for the core_size, which is of size_t format. I put 8 bytes fo= r this because if we want to restore the backup file from i386, it will not cause a problem. next core_size bytes for core.img next one byte contains 0xff - used as a signature bit, seperating the embed and mbr regions next GRUB_DISK_SECTOR_SIZE bytes for mbr ---------------------------------------------------------------------------= ---------------------- Typical operations: 1) grub-setup --help: Usage: grub-setup [OPTION]... DEVICE Set up images to boot from DEVICE. DEVICE must be a GRUB device (e.g. ``(hd0,1)''). -b, --boot-image=3DFILE use FILE as the boot image [default=3Dboot.img] -c, --core-image=3DFILE use FILE as the core image [default=3Dcore.img] -Z, --backup-file=3DFILE use FILE as the backup/restore file [default=3Dbootsector.bak] -d, --directory=3DDIR use GRUB files in the directory DIR [default=3D/boot/grub] -m, --device-map=3DFILE use FILE as the device map [default=3D/boot/grub/device.map] -r, --root-device=3DDEV use DEV as the root device [default=3Dguessed] -f, --force install even if problems are detected -h, --help display this message and exit -z, --restore restore the boot sectors -V, --version print version information and exit -v, --verbose print verbose messages Therefore when we execute grub-setup -d /dev/sda (optionally -Z backup-file name), it will create a file called bootsector.bak in and write to it. RESTORATION: (grub-setup --restore ) V ( grub-setup -z ) V (grub-setup -z -= Z backup_file) .... [ according to the modified help ] PROBLEMS: A warning: util/i386/pc/grub-setup.c:93: warning: =91backup_img=92 may be used uninitialized in this function When I remove the line (496 in the patched one): free(backup_img); the warning goes off. I could not understand how to resolve it. I need some help PATCH DETAILS: Patch obtained by svn di util/i386/pc/grub-setup.c applyihng patch: patch util/i386/pc/grub-setup.c patch_save_mbr I tried my best to follow the coding standards and the style. I am very enthusiastic in developing grub. Please suggest better format for storing the boot sectors. I hope I am not introducing more bugs. Thank you, Kashyap Garimella Jagannadh (irc: garimella ) Undergraduate student, Indian Instition of Technology (IIT), Madras. --0016e64be862cb6fad047361ed66 Content-Type: text/html; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Greetings!

I have added the following new features:

1) when g= rub-setup runs, it automatically stores the areas of (mbr + embed) region, = which are overwritten, into the file (in the following specified format) in= root directory.

2) grub-setup can restore the stored mbr in the following format back t= o destination drive:

Format:
------------------------------------= -------------------------------------------------------------
1st 8 byte= s - for embed_region.start [ this is of type grub_uint64_t - 8bytes for sur= e]
next 8 bytes for the core_size, which is of size_t format. I put 8 bytes fo= r this because if we want to restore the backup file
from i386, it will= not cause a problem.

next core_size bytes for core.img

next = one byte contains 0xff - used as a signature bit, seperating the embed and = mbr regions
next GRUB_DISK_SECTOR_SIZE bytes for mbr
-------------------------------= ------------------------------------------------------------------

T= ypical operations:
1) grub-setup --help:
Usage: grub-setup [OPTION]..= . DEVICE

Set up images to boot from DEVICE.
DEVICE must be a GRUB device (e.g= . ``(hd0,1)'').

=A0 -b, --boot-image=3DFILE=A0=A0 use FILE a= s the boot image [default=3Dboot.img]
=A0 -c, --core-image=3DFILE=A0=A0 = use FILE as the core image [default=3Dcore.img]
=A0 -Z, --backup-file=3DFILE=A0 use FILE as the backup/restore file [defaul= t=3Dbootsector.bak]
=A0 -d, --directory=3DDIR=A0=A0=A0=A0 use GRUB files= in the directory DIR [default=3D/boot/grub]
=A0 -m, --device-map=3DFILE= =A0=A0 use FILE as the device map [default=3D/boot/grub/device.map]
=A0 -r, --root-device=3DDEV=A0=A0 use DEV as the root device [default=3Dgue= ssed]
=A0 -f, --force=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 install even i= f problems are detected
=A0 -h, --help=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0= =A0=A0 display this message and exit
=A0 -z, --restore=A0=A0=A0=A0=A0=A0= =A0=A0=A0=A0 restore the boot sectors
=A0 -V, --version=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 print version information a= nd exit
=A0 -v, --verbose=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 print verbose me= ssages

Therefore when we execute grub-setup -d <dir> /dev/sda = (optionally -Z backup-file name), it will create a file called bootsector.b= ak in <dir> and write to it.
RESTORATION: (grub-setup --restore ) V ( grub-setup -z ) V (grub-setup -z -= Z backup_file) .... [ according to the modified help ]

PROBLEMS:
= A warning:
util/i386/pc/grub-setup.c:93: warning: =91backup_img=92 may b= e used uninitialized in this function
When I remove the line (496 in the patched one): =A0 free(backup_img);
= the warning goes off.
I could not understand how to resolve it. I need s= ome help

PATCH DETAILS:
Patch obtained by
svn di util/i386/pc= /grub-setup.c
applyihng patch:
patch util/i386/pc/grub-setup.c patch_save_mbr

= I tried my best to follow the coding standards and the style. I am very ent= husiastic in developing grub. Please suggest better format for storing the = boot sectors.
I hope I am not introducing more bugs.

Thank you,
Kashyap Garimel= la Jagannadh (irc: garimella )
Undergraduate student,
Indian Institio= n of Technology (IIT), Madras.
--0016e64be862cb6fad047361ed66-- --0016e64be862cb6fb8047361ed68 Content-Type: application/octet-stream; name=patch_save_mbr Content-Disposition: attachment; filename=patch_save_mbr Content-Transfer-Encoding: base64 X-Attachment-Id: f_fzif9g3u0 SW5kZXg6IHV0aWwvaTM4Ni9wYy9ncnViLXNldHVwLmMKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdXRpbC9pMzg2 L3BjL2dydWItc2V0dXAuYwkocmV2aXNpb24gMjU5MikKKysrIHV0aWwvaTM4Ni9wYy9ncnViLXNl dHVwLmMJKHdvcmtpbmcgY29weSkKQEAgLTUzLDYgKzUzLDcgQEAKIAogI2RlZmluZSBERUZBVUxU X0JPT1RfRklMRQkiYm9vdC5pbWciCiAjZGVmaW5lIERFRkFVTFRfQ09SRV9GSUxFCSJjb3JlLmlt ZyIKKyNkZWZpbmUgREVGQVVMVF9CQUNLVVBfRklMRQkiYm9vdHNlY3Rvci5iYWsiCiAKIC8qIFRo aXMgaXMgdGhlIGJsb2NrbGlzdCB1c2VkIGluIHRoZSBkaXNrYm9vdCBpbWFnZS4gICovCiBzdHJ1 Y3QgYm9vdF9ibG9ja2xpc3QKQEAgLTg1LDExICs4NiwxMSBAQAogCiBzdGF0aWMgdm9pZAogc2V0 dXAgKGNvbnN0IGNoYXIgKmRpciwKLSAgICAgICBjb25zdCBjaGFyICpib290X2ZpbGUsIGNvbnN0 IGNoYXIgKmNvcmVfZmlsZSwKLSAgICAgICBjb25zdCBjaGFyICpyb290LCBjb25zdCBjaGFyICpk ZXN0LCBpbnQgbXVzdF9lbWJlZCwgaW50IGZvcmNlKQorICAgICAgIGNvbnN0IGNoYXIgKmJvb3Rf ZmlsZSwgY29uc3QgY2hhciAqY29yZV9maWxlLCBjb25zdCBjaGFyICpiYWNrdXBfZmlsZSwKKyAg ICAgICBjb25zdCBjaGFyICpyb290LCBjb25zdCBjaGFyICpkZXN0LCBpbnQgbXVzdF9lbWJlZCwg aW50IGZvcmNlLCBpbnQgcmVzdG9yZSkKIHsKLSAgY2hhciAqYm9vdF9wYXRoLCAqY29yZV9wYXRo LCAqY29yZV9wYXRoX2RldjsKLSAgY2hhciAqYm9vdF9pbWcsICpjb3JlX2ltZzsKKyAgY2hhciAq Ym9vdF9wYXRoLCAqY29yZV9wYXRoLCAqYmFja3VwX3BhdGgsICpjb3JlX3BhdGhfZGV2OworICBj aGFyICpib290X2ltZywgKmNvcmVfaW1nLCAqYmFja3VwX2ltZzsKICAgc2l6ZV90IGJvb3Rfc2l6 ZSwgY29yZV9zaXplOwogICBncnViX3VpbnQxNl90IGNvcmVfc2VjdG9yczsKICAgZ3J1Yl9kZXZp Y2VfdCByb290X2RldiwgZGVzdF9kZXY7CkBAIC0xMDcsNyArMTA4LDcgQEAKICAgICA9IEdSVUJf Qk9PVF9NQUNISU5FX0tFUk5FTF9TRUcgKyAoR1JVQl9ESVNLX1NFQ1RPUl9TSVpFID4+IDQpOwog ICBncnViX3VpbnQxNl90IGxhc3RfbGVuZ3RoID0gR1JVQl9ESVNLX1NFQ1RPUl9TSVpFOwogICBn cnViX2ZpbGVfdCBmaWxlOwotICBGSUxFICpmcDsKKyAgRklMRSAqZnAsICpiYWNrdXBfZnA7CiAg IHN0cnVjdCB7IGdydWJfdWludDY0X3Qgc3RhcnQ7IGdydWJfdWludDY0X3QgZW5kOyB9IGVtYmVk X3JlZ2lvbjsKICAgZW1iZWRfcmVnaW9uLnN0YXJ0ID0gZW1iZWRfcmVnaW9uLmVuZCA9IH4wVUw7 CiAKQEAgLTE5Niw2ICsxOTcsNzMgQEAKICAgICAgIGN1cnJlbnRfc2VnbWVudCArPSBHUlVCX0RJ U0tfU0VDVE9SX1NJWkUgPj4gNDsKICAgICB9CiAKKyAgaWYocmVzdG9yZSkKKyAgeyAgCisgICAg LyogcmVzdG9yZSB0aGUgYm9vdCBzZWN0b3JzIHRvIHRoZSBwcmV2aW91cyBzdGF0ZSAqLworCisg ICAgLyogb3BlbiB0aGUgYmFja3VwIGZpbGUgdG8gcmVzdG9yZSB0aGUgYm9vdCBzZWN0b3JzICov CisgICAgYmFja3VwX3BhdGggPSBncnViX3V0aWxfZ2V0X3BhdGggKGRpciwgYmFja3VwX2ZpbGUp OworICAgIGJhY2t1cF9pbWcgPSBncnViX3V0aWxfcmVhZF9pbWFnZSAoYmFja3VwX3BhdGgpOwor ICAgICAKKyAgICAvKiBPcGVuIHRoZSBkZXN0aW5hdGlvbiBkZXZpY2UuICAqLworICAgIGRlc3Rf ZGV2ID0gZ3J1Yl9kZXZpY2Vfb3BlbiAoZGVzdCk7CisgICAgaWYgKCEgZGVzdF9kZXYpCisgICAg ICBncnViX3V0aWxfZXJyb3IgKCIlcyIsIGdydWJfZXJybXNnKTsKKworICAgIGdydWJfdXRpbF9p bmZvICgic2V0dGluZyB0aGUgcm9vdCBkZXZpY2UgdG8gYCVzJyIsIHJvb3QpOworICAgIGlmIChn cnViX2Vudl9zZXQgKCJyb290Iiwgcm9vdCkgIT0gR1JVQl9FUlJfTk9ORSkKKyAgICAgIGdydWJf dXRpbF9lcnJvciAoIiVzIiwgZ3J1Yl9lcnJtc2cpOworCisgICAgCisgICAgLyogcmVhZCB0aGUg aW1hZ2UgYW5kIGdldCB0aGUgdmFyaWFibGVzICovCisgICAgaW50IG9mZnNldCA9IDA7CisgICAg Z3J1Yl91aW50NjRfdCBzdGFydCA9ICooKGdydWJfdWludDY0X3QgKikgYmFja3VwX2ltZyk7Cisg ICAgb2Zmc2V0ICs9IDg7CisKKyAgICBjb3JlX3NpemUgPSAqKChzaXplX3QgKikgKGJhY2t1cF9p bWcrb2Zmc2V0KSk7CisgICAgb2Zmc2V0ICs9IDg7CisKKyAgICAvKiBjaGVjayB0aGUgc2l6ZSBv ZiB0aGUgYmFja3VwIGltYWdlICovCisgICAgc2l6ZV90IGJhY2t1cF9pbWdfc2l6ZSA9ICBjb3Jl X3NpemUgKyBHUlVCX0RJU0tfU0VDVE9SX1NJWkUgKyBzaXplb2YoZ3J1Yl91aW50NjRfdCkgKyBz aXplb2Yoc2l6ZV90KSArIDEgLyogc2VwZXJhdGlvbiBieXRlIDB4ZmYgKi8gOworICAgIGlmKCBn cnViX3V0aWxfZ2V0X2ltYWdlX3NpemUgKGJhY2t1cF9wYXRoKSAhPSBiYWNrdXBfaW1nX3NpemUp CisgICAgeworICAgICAgc3RyY3B5KGdydWJfZXJybXNnLCJJbnZhbGlkIHNpemUgb2YgdGhlIGlt YWdlXG4iKTsKKyAgICAgIGdvdG8gdW5hYmxlX3RvX3Jlc3RvcmU7CisgICAgfQorICAgIAorICAg IGlmKCAodW5zaWduZWQgY2hhciliYWNrdXBfaW1nW29mZnNldCArIGNvcmVfc2l6ZV0gIT0gIDB4 ZmYpCisgICAgeworICAgICAgc3RyY3B5KGdydWJfZXJybXNnLCJUaGUgYmFja3VwIGZpbGUgaXMg Y29ycnVwdGVkXG4iKTsKKyAgICAgIGdvdG8gdW5hYmxlX3RvX3Jlc3RvcmU7CisgICAgfQorCisg ICAgLyogV3JpdGUgdGhlIGNvcmUgaW1hZ2Ugb24gdGhlIGRpc2suICAqLworICAgIGlmIChncnVi X2Rpc2tfd3JpdGUgKGRlc3RfZGV2LT5kaXNrLCBzdGFydCwgMCwgY29yZV9zaXplLCAoY2hhciAq KShiYWNrdXBfaW1nK29mZnNldCkpKQorICAgICAgZ3J1Yl91dGlsX2Vycm9yICgiJXMiLCBncnVi X2Vycm1zZyk7CisKKyAgICAvKiB0aGUgYnl0ZSBhZnRlciB0aGUgY29yZSBpbWFnZSBoYXMgMHhm ZiBpbiB0aGUgZmlsZSAqLworICAgIG9mZnNldCArPSBjb3JlX3NpemUgKyAxOworCisgICAgLyog V3JpdGUgdGhlIG1iciBvbiB0aGUgZGlzay4gICovCisgICAgaWYgKGdydWJfZGlza193cml0ZSAo ZGVzdF9kZXYtPmRpc2ssIDAsIDAsIEdSVUJfRElTS19TRUNUT1JfU0laRSwgKGNoYXIgKikoYmFj a3VwX2ltZytvZmZzZXQpKSkKKyAgICAgIGdydWJfdXRpbF9lcnJvciAoIiVzIiwgZ3J1Yl9lcnJt c2cpOworCisgICAgLyogZnJlZSB0aGUgdXNlZCBzdHVmZiAqLworICAgIGZyZWUoYmFja3VwX2lt Zyk7ICAgCisgICAgZ3J1Yl9kZXZpY2VfY2xvc2UgKGRlc3RfZGV2KTsKKworICAgIHJldHVybjsK KwordW5hYmxlX3RvX3Jlc3RvcmU6CisgICAgLyogZmlyc3QgZnJlZSB0aGUgdXNlZCBzdHVmZiAq LworICAgIGZyZWUoYmFja3VwX2ltZyk7ICAgCisgICAgZ3J1Yl9kZXZpY2VfY2xvc2UgKGRlc3Rf ZGV2KTsKKyAgICAvKiB0aGVuIHJlcG9ydCBlcnJvcnMgKi8KKyAgICBncnViX3V0aWxfZXJyb3Io IiVzXG5VbmFibGUgdG8gcmVzdG9yZSB0aGUgYm9vdCBzZWN0b3IiLGdydWJfZXJybXNnKTsKKyAg ICByZXR1cm47CisKKyAgfQorCiAgIC8qIFJlYWQgdGhlIGJvb3QgaW1hZ2UgYnkgdGhlIE9TIHNl cnZpY2UuICAqLwogICBib290X3BhdGggPSBncnViX3V0aWxfZ2V0X3BhdGggKGRpciwgYm9vdF9m aWxlKTsKICAgYm9vdF9zaXplID0gZ3J1Yl91dGlsX2dldF9pbWFnZV9zaXplIChib290X3BhdGgp OwpAQCAtMzgwLDEyICs0NDgsNjAgQEAKICAgYmxvY2stPmxlbiA9IDA7CiAgIGJsb2NrLT5zZWdt ZW50ID0gMDsKIAorICAvKiBTYXZlIHRoZSBib290IHNlY3RvcnMgKGluY2x1ZGluZyB0aGUgZW1i ZWQgcmVnaW9uKSBiZWZvcmUgd3JpdGluZyAqLworICBiYWNrdXBfcGF0aCA9IGdydWJfdXRpbF9n ZXRfcGF0aCAoZGlyLCBiYWNrdXBfZmlsZSk7CisgIGJhY2t1cF9mcCA9ICBmb3BlbiAoYmFja3Vw X3BhdGgsICJ3Iik7CisKKyAgaWYgKCFiYWNrdXBfZnApCisgIHsKKyAgICBzdHJjcHkoZ3J1Yl9l cnJtc2csIlVuYWJsZSB0byBjcmVhdGUgdGhlIGJhY2t1cCBmaWxlIik7CisgICAgZ290byB1bmFi bGVfdG9fc2F2ZTsKKyAgfQorCisgIC8qIDggYnl0ZXMgZm9yIGVtYmVkX3JlZ2lvbi5zdGFydCwg YW5vdGhlciA4IGZvciBjb3JlX3NpemUgKi8KKyAgaW50IGJhY2t1cF9pbWdfc2l6ZSA9ICBjb3Jl X3NpemUgKyBHUlVCX0RJU0tfU0VDVE9SX1NJWkUgKyA4ICArIDggKyAxIC8qIHNlcGVyYXRpb24g Ynl0ZSAweGZmICovIDsKKyAgYmFja3VwX2ltZyA9IChjaGFyICopIHhtYWxsb2MgKGJhY2t1cF9p bWdfc2l6ZSk7CisgIAorICAKKyAgaW50IG9mZnNldCA9IDA7CisgIAorICBtZW1jcHkgKGJhY2t1 cF9pbWcsIChjaGFyICopKCZlbWJlZF9yZWdpb24uc3RhcnQpLCBzaXplb2YoZ3J1Yl91aW50NjRf dCkpOworICBvZmZzZXQgKz0gODsKKyAgCisgIG1lbWNweSAoIGJhY2t1cF9pbWcgKyBvZmZzZXQs IChjaGFyICopKCZjb3JlX3NpemUpLCBzaXplb2Yoc2l6ZV90KSApOworICBvZmZzZXQgKz0gODsK KyAgCisgIGlmKGdydWJfZGlza19yZWFkKCBkZXN0X2Rldi0+ZGlzaywgZW1iZWRfcmVnaW9uLnN0 YXJ0LCAwLCBjb3JlX3NpemUsIGJhY2t1cF9pbWcrb2Zmc2V0ICkpCisJICBnb3RvIHVuYWJsZV90 b19zYXZlOworICBvZmZzZXQgKz0gY29yZV9zaXplOworICAKKyAgYmFja3VwX2ltZ1tvZmZzZXQr K10gPSAweGZmOyAJLyogc2VwZXJhdGlvbiBieXRlIGJldHdlZW4gY29yZSBpbWcgYW5kIG1iciAq LworICAKKyAgaWYoZ3J1Yl9kaXNrX3JlYWQoIGRlc3RfZGV2LT5kaXNrLCAwLCAwLCBHUlVCX0RJ U0tfU0VDVE9SX1NJWkUsIGJhY2t1cF9pbWcrb2Zmc2V0ICkpCisJICBnb3RvIHVuYWJsZV90b19z YXZlOworICBvZmZzZXQgKz0gR1JVQl9ESVNLX1NFQ1RPUl9TSVpFOworICAKKyAgLyogd3JpdGUg aW1hZ2UgdG8gZmlsZSAqLworICBmd3JpdGUgKGJhY2t1cF9pbWcsIDEsIGJhY2t1cF9pbWdfc2l6 ZSwgYmFja3VwX2ZwKTsKKyAgCisgIGdvdG8gc2F2ZV9maW5pc2g7CisgIAordW5hYmxlX3RvX3Nh dmU6CisgIGdydWJfdXRpbF93YXJuKCJlcnJvcjolc1xuIixncnViX2Vycm1zZyk7CisgIGdydWJf dXRpbF93YXJuKCJVbmFibGUgdG8gc2F2ZSB0aGUgYm9vdCBzZWN0b3JcbiIpOworCitzYXZlX2Zp bmlzaDogIAorICBmY2xvc2UgKGJhY2t1cF9mcCk7CisgIGZyZWUoYmFja3VwX3BhdGgpOworICBm cmVlKGJhY2t1cF9pbWcpOworCisKICAgLyogV3JpdGUgdGhlIGNvcmUgaW1hZ2Ugb250byB0aGUg ZGlzay4gICovCiAgIGlmIChncnViX2Rpc2tfd3JpdGUgKGRlc3RfZGV2LT5kaXNrLCBlbWJlZF9y ZWdpb24uc3RhcnQsIDAsIGNvcmVfc2l6ZSwgY29yZV9pbWcpKQogICAgIGdydWJfdXRpbF9lcnJv ciAoIiVzIiwgZ3J1Yl9lcnJtc2cpOwogCiAgIC8qIEZJWE1FOiBjYW4gdGhpcyBiZSBza2lwcGVk PyAgKi8KLSAgKmJvb3RfZHJpdmUgPSAweEZGOworICAqYm9vdF9kcml2ZSA9IDB4ZmY7CiAKICAg Kmtlcm5lbF9zZWN0b3IgPSBncnViX2NwdV90b19sZTY0IChlbWJlZF9yZWdpb24uc3RhcnQpOwog CkBAIC01NTUsOSArNjcxLDExIEBACiAgICAgeyJkaXJlY3RvcnkiLCByZXF1aXJlZF9hcmd1bWVu dCwgMCwgJ2QnfSwKICAgICB7ImRldmljZS1tYXAiLCByZXF1aXJlZF9hcmd1bWVudCwgMCwgJ20n fSwKICAgICB7InJvb3QtZGV2aWNlIiwgcmVxdWlyZWRfYXJndW1lbnQsIDAsICdyJ30sCisgICAg eyJiYWNrdXAtZmlsZSIsIHJlcXVpcmVkX2FyZ3VtZW50LCAwLCAnWid9LAogICAgIHsiZm9yY2Ui LCBub19hcmd1bWVudCwgMCwgJ2YnfSwKICAgICB7ImhlbHAiLCBub19hcmd1bWVudCwgMCwgJ2gn fSwKICAgICB7InZlcnNpb24iLCBub19hcmd1bWVudCwgMCwgJ1YnfSwKKyAgICB7InJlc3RvcmUi LCBub19hcmd1bWVudCwgMCwgJ3onfSwKICAgICB7InZlcmJvc2UiLCBub19hcmd1bWVudCwgMCwg J3YnfSwKICAgICB7MCwgMCwgMCwgMH0KICAgfTsKQEAgLTU3NiwxNyArNjk0LDE5IEBACiBcblwK ICAgLWIsIC0tYm9vdC1pbWFnZT1GSUxFICAgdXNlIEZJTEUgYXMgdGhlIGJvb3QgaW1hZ2UgW2Rl ZmF1bHQ9JXNdXG5cCiAgIC1jLCAtLWNvcmUtaW1hZ2U9RklMRSAgIHVzZSBGSUxFIGFzIHRoZSBj b3JlIGltYWdlIFtkZWZhdWx0PSVzXVxuXAorICAtWiwgLS1iYWNrdXAtZmlsZT1GSUxFICB1c2Ug RklMRSBhcyB0aGUgYmFja3VwL3Jlc3RvcmUgZmlsZSBbZGVmYXVsdD0lc11cblwKICAgLWQsIC0t ZGlyZWN0b3J5PURJUiAgICAgdXNlIEdSVUIgZmlsZXMgaW4gdGhlIGRpcmVjdG9yeSBESVIgW2Rl ZmF1bHQ9JXNdXG5cCiAgIC1tLCAtLWRldmljZS1tYXA9RklMRSAgIHVzZSBGSUxFIGFzIHRoZSBk ZXZpY2UgbWFwIFtkZWZhdWx0PSVzXVxuXAogICAtciwgLS1yb290LWRldmljZT1ERVYgICB1c2Ug REVWIGFzIHRoZSByb290IGRldmljZSBbZGVmYXVsdD1ndWVzc2VkXVxuXAogICAtZiwgLS1mb3Jj ZSAgICAgICAgICAgICBpbnN0YWxsIGV2ZW4gaWYgcHJvYmxlbXMgYXJlIGRldGVjdGVkXG5cCiAg IC1oLCAtLWhlbHAgICAgICAgICAgICAgIGRpc3BsYXkgdGhpcyBtZXNzYWdlIGFuZCBleGl0XG5c CisgIC16LCAtLXJlc3RvcmUgICAgICAgICAgIHJlc3RvcmUgdGhlIGJvb3Qgc2VjdG9yc1xuXAog ICAtViwgLS12ZXJzaW9uICAgICAgICAgICBwcmludCB2ZXJzaW9uIGluZm9ybWF0aW9uIGFuZCBl eGl0XG5cCiAgIC12LCAtLXZlcmJvc2UgICAgICAgICAgIHByaW50IHZlcmJvc2UgbWVzc2FnZXNc blwKIFxuXAogUmVwb3J0IGJ1Z3MgdG8gPCVzPi5cblwKICIsCi0JICAgIERFRkFVTFRfQk9PVF9G SUxFLCBERUZBVUxUX0NPUkVfRklMRSwgREVGQVVMVF9ESVJFQ1RPUlksCisJICAgIERFRkFVTFRf Qk9PVF9GSUxFLCBERUZBVUxUX0NPUkVfRklMRSwgREVGQVVMVF9CQUNLVVBfRklMRSwgREVGQVVM VF9ESVJFQ1RPUlksCiAJICAgIERFRkFVTFRfREVWSUNFX01BUCwgUEFDS0FHRV9CVUdSRVBPUlQp OwogCiAgIGV4aXQgKHN0YXR1cyk7CkBAIC02MDksMTggKzcyOSwxOSBAQAogewogICBjaGFyICpi b290X2ZpbGUgPSAwOwogICBjaGFyICpjb3JlX2ZpbGUgPSAwOworICBjaGFyICpiYWNrdXBfZmls ZSA9IDA7CiAgIGNoYXIgKmRpciA9IDA7CiAgIGNoYXIgKmRldl9tYXAgPSAwOwogICBjaGFyICpy b290X2RldiA9IDA7CiAgIGNoYXIgKmRlc3RfZGV2OwotICBpbnQgbXVzdF9lbWJlZCA9IDAsIGZv cmNlID0gMDsKKyAgaW50IG11c3RfZW1iZWQgPSAwLCBmb3JjZSA9IDAsIHJlc3RvcmUgPSAwOwog CiAgIHByb2duYW1lID0gImdydWItc2V0dXAiOwogCiAgIC8qIENoZWNrIGZvciBvcHRpb25zLiAg Ki8KICAgd2hpbGUgKDEpCiAgICAgewotICAgICAgaW50IGMgPSBnZXRvcHRfbG9uZyAoYXJnYywg YXJndiwgImI6YzpkOm06cjpoVnZmIiwgb3B0aW9ucywgMCk7CisgICAgICBpbnQgYyA9IGdldG9w dF9sb25nIChhcmdjLCBhcmd2LCAiYjpjOmQ6bTpyOlo6aFZ2ZnoiLCBvcHRpb25zLCAwKTsKIAog ICAgICAgaWYgKGMgPT0gLTEpCiAJYnJlYWs7CkBAIC02NzgsNiArNzk5LDE3IEBACiAJICAgIHZl cmJvc2l0eSsrOwogCSAgICBicmVhazsKIAorCSAgY2FzZSAnWic6CisJICAgIGlmIChiYWNrdXBf ZmlsZSkKKwkgICAgICBmcmVlIChiYWNrdXBfZmlsZSk7CisKKwkgICAgYmFja3VwX2ZpbGUgPSB4 c3RyZHVwIChvcHRhcmcpOworCSAgICBicmVhazsKKworCSAgY2FzZSAneic6CisJICAgIHJlc3Rv cmU9MTsKKwkgICAgYnJlYWs7CisKIAkgIGRlZmF1bHQ6CiAJICAgIHVzYWdlICgxKTsKIAkgICAg YnJlYWs7CkBAIC03NjcsNyArODk5LDggQEAKIAkgIHNldHVwIChkaXIgPyA6IERFRkFVTFRfRElS RUNUT1JZLAogCQkgYm9vdF9maWxlID8gOiBERUZBVUxUX0JPT1RfRklMRSwKIAkJIGNvcmVfZmls ZSA/IDogREVGQVVMVF9DT1JFX0ZJTEUsCi0JCSByb290X2RldiwgZ3J1Yl91dGlsX2dldF9ncnVi X2RldiAoZGV2aWNlbGlzdFtpXSksIDEsIGZvcmNlKTsKKwkJIGJhY2t1cF9maWxlID8gOiBERUZB VUxUX0JBQ0tVUF9GSUxFLAorCQkgcm9vdF9kZXYsIGdydWJfdXRpbF9nZXRfZ3J1Yl9kZXYgKGRl dmljZWxpc3RbaV0pLCAxLCBmb3JjZSxyZXN0b3JlKTsKIAl9CiAgICAgfQogICBlbHNlCkBAIC03 NzYsNyArOTA5LDggQEAKICAgICBzZXR1cCAoZGlyID8gOiBERUZBVUxUX0RJUkVDVE9SWSwKIAkg ICBib290X2ZpbGUgPyA6IERFRkFVTFRfQk9PVF9GSUxFLAogCSAgIGNvcmVfZmlsZSA/IDogREVG QVVMVF9DT1JFX0ZJTEUsCi0JICAgcm9vdF9kZXYsIGRlc3RfZGV2LCBtdXN0X2VtYmVkLCBmb3Jj ZSk7CisJICAgYmFja3VwX2ZpbGUgPyA6IERFRkFVTFRfQkFDS1VQX0ZJTEUsCisJICAgcm9vdF9k ZXYsIGRlc3RfZGV2LCBtdXN0X2VtYmVkLCBmb3JjZSxyZXN0b3JlKTsKIAogICAvKiBGcmVlIHJl c291cmNlcy4gICovCiAgIGdydWJfZmluaV9hbGwgKCk7Cg== --0016e64be862cb6fb8047361ed68--