diff options
author | Christian Breunig <christian@breunig.cc> | 2023-09-22 06:17:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-22 06:17:22 +0200 |
commit | 7253377e754ed8bc95cbe59840ed3a70c6945b93 (patch) | |
tree | 333128015588c810cee417b756c4468a6c4cb302 /src/op_mode/format_disk.py | |
parent | a4aad112042b5bb4988468a5af871f5a81a851e5 (diff) | |
parent | 2d3f3297b575f88662495e14a7c7324ff73b6bfc (diff) | |
download | vyos-1x-7253377e754ed8bc95cbe59840ed3a70c6945b93.tar.gz vyos-1x-7253377e754ed8bc95cbe59840ed3a70c6945b93.zip |
Merge pull request #2298 from jestabro/disk-by-id
smoketest: T5607: support getting SCSI device by drive-id
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) |