diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-07-21 04:53:03 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 04:53:03 +0700 |
| commit | b7d7af33789d5f98ec27f326668a6b16ff228678 (patch) | |
| tree | 0ce2988b1ce9d970e8a34c6af45f5a78128cf70e | |
| parent | 34f4d01d447c300e9dce824f822eae4b9cdbd705 (diff) | |
| parent | 0c8e4605f19e7caa6fb7ccb7009bb21bb9c6cdbc (diff) | |
| download | vyos-1x-b7d7af33789d5f98ec27f326668a6b16ff228678.tar.gz vyos-1x-b7d7af33789d5f98ec27f326668a6b16ff228678.zip | |
Merge pull request #17 from runborg/current
T689: updated show host xml and fixed op_mode script names from last PR.
| -rw-r--r-- | op-mode-definitions/show-configuration.xml | 2 | ||||
| -rw-r--r-- | op-mode-definitions/show-disk.xml | 2 | ||||
| -rw-r--r-- | op-mode-definitions/show-host.xml | 37 | ||||
| -rwxr-xr-x | src/op_mode/show_configuration_files.sh (renamed from src/op_mode/show-configuration-files.sh) | 0 | ||||
| -rwxr-xr-x | src/op_mode/show_disk_format.sh (renamed from src/op_mode/show-disk-format.sh) | 0 | ||||
| -rwxr-xr-x | src/op_mode/show_raid.sh (renamed from src/op_mode/show-raid.sh) | 0 |
6 files changed, 39 insertions, 2 deletions
diff --git a/op-mode-definitions/show-configuration.xml b/op-mode-definitions/show-configuration.xml index 0b1507ba4..90c1533fb 100644 --- a/op-mode-definitions/show-configuration.xml +++ b/op-mode-definitions/show-configuration.xml @@ -29,7 +29,7 @@ <help> Show available saved configurations </help> </properties> <!-- no admin check --> - <command>${vyos_op_scripts_dir}/show-configuration-files.sh</command> + <command>${vyos_op_scripts_dir}/show_configuration_files.sh</command> </node> </children> </node> diff --git a/op-mode-definitions/show-disk.xml b/op-mode-definitions/show-disk.xml index db473959a..8a8e35515 100644 --- a/op-mode-definitions/show-disk.xml +++ b/op-mode-definitions/show-disk.xml @@ -14,7 +14,7 @@ <properties> <help>Show disk drive formatting</help> </properties> - <command>${vyos_op_scripts_dir}/show-disk-format.sh $3</command> + <command>${vyos_op_scripts_dir}/show_disk_format.sh $3</command> </leafNode> </children> </tagNode> diff --git a/op-mode-definitions/show-host.xml b/op-mode-definitions/show-host.xml new file mode 100644 index 000000000..b3ea129a2 --- /dev/null +++ b/op-mode-definitions/show-host.xml @@ -0,0 +1,37 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="show"> + <children> + <node name="host"> + <properties> + <help>Show host information</help> + </properties> + <children> + <leafNode name="domain"> + <properties> + <help>Show domain name</help> + </properties> + <command>/bin/domainname -d</command> + </leafNode> + + <leafNode name="name"> + <properties> + <help>Show host name</help> + </properties> + <command>/bin/hostname</command> + </leafNode> + + <tagNode name="lookup"> + <properties> + <help>Lookup host information for hostname|IPv4 address</help> + </properties> + <command>/usr/bin/host $4</command> + </tagNode> + + + </children> + </node> + + </children> + </node> +</interfaceDefinition> diff --git a/src/op_mode/show-configuration-files.sh b/src/op_mode/show_configuration_files.sh index ad8e0747c..ad8e0747c 100755 --- a/src/op_mode/show-configuration-files.sh +++ b/src/op_mode/show_configuration_files.sh diff --git a/src/op_mode/show-disk-format.sh b/src/op_mode/show_disk_format.sh index 61b15a52b..61b15a52b 100755 --- a/src/op_mode/show-disk-format.sh +++ b/src/op_mode/show_disk_format.sh diff --git a/src/op_mode/show-raid.sh b/src/op_mode/show_raid.sh index ba4174692..ba4174692 100755 --- a/src/op_mode/show-raid.sh +++ b/src/op_mode/show_raid.sh |