diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-09-19 11:24:24 -0500 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-09-22 14:33:04 +0000 |
| commit | 4da9e2cf686a06db8b09d5b88568a08fcdb0a29d (patch) | |
| tree | d2e1f2bb2563edfeec14e6f840a8a56c6e8b95ed | |
| parent | b5edc618a4425e54c711e77c509114909b550f8c (diff) | |
| download | vyos-1x-4da9e2cf686a06db8b09d5b88568a08fcdb0a29d.tar.gz vyos-1x-4da9e2cf686a06db8b09d5b88568a08fcdb0a29d.zip | |
op-mode: disk: T5609: add arg by-id to format disk
(cherry picked from commit 42736111facf08ac37b86e6fc3cbd395aab166bc)
| -rw-r--r-- | op-mode-definitions/disks.xml.in | 20 | ||||
| -rwxr-xr-x | src/op_mode/format_disk.py | 11 |
2 files changed, 29 insertions, 2 deletions
diff --git a/op-mode-definitions/disks.xml.in b/op-mode-definitions/disks.xml.in index 117ac5065..8a1e2c86f 100644 --- a/op-mode-definitions/disks.xml.in +++ b/op-mode-definitions/disks.xml.in @@ -5,6 +5,26 @@ <help>Format a device</help> </properties> <children> + <node name="by-id"> + <properties> + <help>Find disk by ending of id string</help> + </properties> + <children> + <tagNode name="disk"> + <properties> + <help>Format a disk drive</help> + </properties> + <children> + <tagNode name="like"> + <properties> + <help>Format this disk the same as another disk</help> + </properties> + <command>sudo ${vyos_op_scripts_dir}/format_disk.py --by-id --target $4 --proto $6</command> + </tagNode> + </children> + </tagNode> + </children> + </node> <tagNode name="disk"> <properties> <help>Format a disk drive</help> 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) |