diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-18 18:31:37 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-18 18:31:37 +0300 |
commit | 0de815356474912ef5bef9a69f0327a5a93bb2c2 (patch) | |
tree | 92db8fda09396081f58a0c5fb182e72fbc3fdd50 /test | |
parent | 9a06eb800c1bdc68aa81fcad6d4f404e12dfff33 (diff) | |
parent | bf88d2b023063a0c46d7617a4f6897d5d561662d (diff) | |
download | u-boot-0de815356474912ef5bef9a69f0327a5a93bb2c2.tar.xz |
Merge branch '2019-07-17-master-imports'
- Various FS/disk related fixes with security implications.
- Proper fix for the pci_ep test.
- Assorted bugfixes
- Some MediaTek updates.
- 'env erase' support.
Diffstat (limited to 'test')
-rw-r--r-- | test/py/tests/test_gpt.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test/py/tests/test_gpt.py b/test/py/tests/test_gpt.py index c8edb33642..229d7eb2c2 100644 --- a/test/py/tests/test_gpt.py +++ b/test/py/tests/test_gpt.py @@ -40,16 +40,19 @@ class GptTestDiskImage(object): fd = os.open(persistent, os.O_RDWR | os.O_CREAT) os.ftruncate(fd, 4194304) os.close(fd) - cmd = ('sgdisk', '-U', '375a56f7-d6c9-4e81-b5f0-09d41ca89efe', + cmd = ('sgdisk', + '--disk-guid=375a56f7-d6c9-4e81-b5f0-09d41ca89efe', persistent) u_boot_utils.run_and_log(u_boot_console, cmd) # part1 offset 1MB size 1MB - cmd = ('sgdisk', '--new=1:2048:4095', '-c 1:part1', persistent) + cmd = ('sgdisk', '--new=1:2048:4095', '--change-name=1:part1', + persistent) # part2 offset 2MB size 1.5MB u_boot_utils.run_and_log(u_boot_console, cmd) - cmd = ('sgdisk', '--new=2:4096:7167', '-c 2:part2', persistent) + cmd = ('sgdisk', '--new=2:4096:7167', '--change-name=2:part2', + persistent) u_boot_utils.run_and_log(u_boot_console, cmd) - cmd = ('sgdisk', '-l', persistent) + cmd = ('sgdisk', '--load-backup=' + persistent) u_boot_utils.run_and_log(u_boot_console, cmd) cmd = ('cp', persistent, self.path) |