|
 |
7fd79c |
From 0e70861c9f72fb2e06f9a121e6dac0e542ee1230 Mon Sep 17 00:00:00 2001
|
|
|
7fd79c |
From: "Brian C. Lane" <bcl@redhat.com>
|
|
|
7fd79c |
Date: Wed, 27 Jun 2018 13:45:09 -0700
|
|
|
7fd79c |
Subject: [PATCH 82/86] Modify gpt-header-move and msdos-overlap to work with
|
|
|
7fd79c |
py2 or py3
|
|
|
7fd79c |
|
|
|
7fd79c |
Distributions are starting to remove python2 and only use python3.
|
|
|
7fd79c |
Modify these test scripts so that they will work with either python 2.7
|
|
|
7fd79c |
or python 3.X
|
|
|
7fd79c |
---
|
|
|
7fd79c |
tests/gpt-header-move | 15 ++++++++-------
|
|
|
7fd79c |
tests/msdos-overlap | 5 ++---
|
|
|
7fd79c |
2 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
7fd79c |
|
|
|
7fd79c |
diff --git a/tests/gpt-header-move b/tests/gpt-header-move
|
|
|
7fd79c |
index 05cdc65..3dda5cb 100755
|
|
|
7fd79c |
--- a/tests/gpt-header-move
|
|
|
7fd79c |
+++ b/tests/gpt-header-move
|
|
|
7fd79c |
@@ -3,20 +3,21 @@
|
|
|
7fd79c |
# open img file, subtract 33 from altlba address, and move the last 33 sectors
|
|
|
7fd79c |
# back by 33 sectors
|
|
|
7fd79c |
|
|
|
7fd79c |
-from struct import *
|
|
|
7fd79c |
+from struct import unpack_from, pack_into
|
|
|
7fd79c |
from zipfile import crc32
|
|
|
7fd79c |
import array
|
|
|
7fd79c |
import sys
|
|
|
7fd79c |
+
|
|
|
7fd79c |
file = open(sys.argv[1],'rb+')
|
|
|
7fd79c |
file.seek(512)
|
|
|
7fd79c |
gptheader = file.read(512)
|
|
|
7fd79c |
-altlba = unpack_from('
|
|
|
7fd79c |
-gptheader = array.array('c',gptheader)
|
|
|
7fd79c |
+altlba = unpack_from('
|
|
|
7fd79c |
+gptheader = array.array('B', gptheader)
|
|
|
7fd79c |
pack_into('
|
|
|
7fd79c |
#zero header crc
|
|
|
7fd79c |
pack_into('
|
|
|
7fd79c |
#compute new crc
|
|
|
7fd79c |
-newcrc = ((crc32(buffer(gptheader,0,92))) & 0xFFFFFFFF)
|
|
|
7fd79c |
+newcrc = ((crc32(gptheader[:92])) & 0xFFFFFFFF)
|
|
|
7fd79c |
pack_into('
|
|
|
7fd79c |
file.seek(512)
|
|
|
7fd79c |
file.write(gptheader)
|
|
|
7fd79c |
@@ -25,7 +26,7 @@ gptheader = file.read(512)
|
|
|
7fd79c |
file.seek(512*(altlba-32))
|
|
|
7fd79c |
backup = file.read(512*32)
|
|
|
7fd79c |
altlba -= 33
|
|
|
7fd79c |
-gptheader = array.array('c',gptheader)
|
|
|
7fd79c |
+gptheader = array.array('B',gptheader)
|
|
|
7fd79c |
#update mylba
|
|
|
7fd79c |
pack_into('
|
|
|
7fd79c |
#update table lba
|
|
|
7fd79c |
@@ -33,9 +34,9 @@ pack_into('
|
|
|
7fd79c |
#zero header crc
|
|
|
7fd79c |
pack_into('
|
|
|
7fd79c |
#compute new crc
|
|
|
7fd79c |
-newcrc = ((crc32(buffer(gptheader,0,92))) & 0xFFFFFFFF)
|
|
|
7fd79c |
+newcrc = ((crc32(gptheader[:92])) & 0xFFFFFFFF)
|
|
|
7fd79c |
pack_into('
|
|
|
7fd79c |
file.seek(512*(altlba-32))
|
|
|
7fd79c |
file.write(backup)
|
|
|
7fd79c |
file.write(gptheader)
|
|
|
7fd79c |
-file.write("\0" * (512 * 33))
|
|
|
7fd79c |
+file.write(b"\0" * (512 * 33))
|
|
|
7fd79c |
diff --git a/tests/msdos-overlap b/tests/msdos-overlap
|
|
|
7fd79c |
index 5bddfb0..d6ae8d6 100755
|
|
|
7fd79c |
--- a/tests/msdos-overlap
|
|
|
7fd79c |
+++ b/tests/msdos-overlap
|
|
|
7fd79c |
@@ -14,12 +14,11 @@ BAD_ENTRY = (0x72, 0xf5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
|
7fd79c |
OFFSET = 0x1b8
|
|
|
7fd79c |
|
|
|
7fd79c |
if len(sys.argv) < 2:
|
|
|
7fd79c |
- print "%s: <image or device>"
|
|
|
7fd79c |
+ print("%s: <image or device>" % sys.argv[0])
|
|
|
7fd79c |
sys.exit(1)
|
|
|
7fd79c |
|
|
|
7fd79c |
-data = "".join(chr(c) for c in BAD_ENTRY)
|
|
|
7fd79c |
with open(sys.argv[1], "rb+") as f:
|
|
|
7fd79c |
f.seek(OFFSET, 0)
|
|
|
7fd79c |
- f.write(data)
|
|
|
7fd79c |
+ f.write(bytes(bytearray(BAD_ENTRY)))
|
|
|
7fd79c |
|
|
|
7fd79c |
sys.exit(0)
|
|
|
7fd79c |
--
|
|
|
7fd79c |
2.17.1
|
|
|
7fd79c |
|