diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-09-22 09:51:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-22 09:51:48 -0500 |
| commit | 90ce099f065325841c4c18b4a4beadaf141a35b2 (patch) | |
| tree | d2e9a3c78199669f887d2a8c376811d9e011f7df /src/op_mode/format_disk.py | |
| parent | e0ce69365f46db5339144cb27bff6b3dd5924871 (diff) | |
| parent | 7447b4ef6e6cc8a9b1e7b8062935c52d3b4429cb (diff) | |
| download | vyos-1x-90ce099f065325841c4c18b4a4beadaf141a35b2.tar.gz vyos-1x-90ce099f065325841c4c18b4a4beadaf141a35b2.zip | |
Merge pull request #2301 from vyos/mergify/bp/sagitta/pr-2298
smoketest: T5607: support getting SCSI device by drive-id (backport #2298)
Diffstat (limited to 'src/op_mode/format_disk.py')
| -rwxr-xr-x | src/op_mode/format_disk.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/op_mode/format_disk.py b/src/op_mode/format_disk.py index 31ceb196a..dc3c96322 100755 --- a/src/op_mode/format_disk.py +++ b/src/op_mode/format_disk.py @@ -24,6 +24,7 @@ from vyos.utils.io import ask_yes_no from vyos.utils.process import call from vyos.utils.process import cmd from vyos.utils.process import DEVNULL +from vyos.utils.disk import device_from_id def list_disks(): disks = set() @@ -77,12 +78,18 @@ if __name__ == '__main__': group = parser.add_argument_group() group.add_argument('-t', '--target', type=str, required=True, help='Target device to format') group.add_argument('-p', '--proto', type=str, required=True, help='Prototype device to use as reference') + parser.add_argument('--by-id', action='store_true', help='Specify device by disk id') args = parser.parse_args() + target = args.target + proto = args.proto + if args.by_id: + target = device_from_id(target) + proto = device_from_id(proto) - target_disk = args.target + target_disk = target eligible_target_disks = list_disks() - proto_disk = args.proto + proto_disk = proto eligible_proto_disks = eligible_target_disks.copy() eligible_proto_disks.remove(target_disk) |