From 9b77c401bdd06230cceab7f3e37fc80958cfc72a Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Sun, 17 Jun 2018 22:28:21 +0200 Subject: rewrite show host to new syntax --- op-mode-definitions/show-host.xml | 51 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 op-mode-definitions/show-host.xml diff --git a/op-mode-definitions/show-host.xml b/op-mode-definitions/show-host.xml new file mode 100644 index 000000000..39c6c3acc --- /dev/null +++ b/op-mode-definitions/show-host.xml @@ -0,0 +1,51 @@ + + + + + + + Show host information + + + + + Show host current date + + /bin/date + + + + + Show domain name + + /bin/domainname -d + + + + + Show host name + + /bin/hostname + + + + + Show host operating system details + + /bin/uname -a + + + + + Lookup host information for hostname|IPv4 address + + /usr/bin/host $4 + + + + + + + + + -- cgit v1.2.3 From ef15a3760a1d66543b8bda773748a78c8c05e99b Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Sat, 23 Jun 2018 23:32:47 +0200 Subject: T689: changed from dash to underscore in filenames --- src/op_mode/show-configuration-files.sh | 10 ---------- src/op_mode/show-disk-format.sh | 8 -------- src/op_mode/show-raid.sh | 17 ----------------- src/op_mode/show_configuration_files.sh | 10 ++++++++++ src/op_mode/show_disk_format.sh | 8 ++++++++ src/op_mode/show_raid.sh | 17 +++++++++++++++++ 6 files changed, 35 insertions(+), 35 deletions(-) delete mode 100755 src/op_mode/show-configuration-files.sh delete mode 100755 src/op_mode/show-disk-format.sh delete mode 100755 src/op_mode/show-raid.sh create mode 100755 src/op_mode/show_configuration_files.sh create mode 100755 src/op_mode/show_disk_format.sh create mode 100755 src/op_mode/show_raid.sh diff --git a/src/op_mode/show-configuration-files.sh b/src/op_mode/show-configuration-files.sh deleted file mode 100755 index ad8e0747c..000000000 --- a/src/op_mode/show-configuration-files.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -# Wrapper script for the show configuration files command -find ${vyatta_sysconfdir}/config/ \ - -type f \ - -not -name ".*" \ - -not -name "config.boot.*" \ - -printf "%f\t(%Tc)\t%T@\n" \ - | sort -r -k3 \ - | awk -F"\t" '{printf ("%-20s\t%s\n", $1,$2) ;}' diff --git a/src/op_mode/show-disk-format.sh b/src/op_mode/show-disk-format.sh deleted file mode 100755 index 61b15a52b..000000000 --- a/src/op_mode/show-disk-format.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -disk_dev="/dev/$1" -if [ ! -b "$disk_dev" ];then - echo "$3 is not a disk device" - exit 1 -fi -sudo /sbin/fdisk -l "$disk_dev" diff --git a/src/op_mode/show-raid.sh b/src/op_mode/show-raid.sh deleted file mode 100755 index ba4174692..000000000 --- a/src/op_mode/show-raid.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -raid_set_name=$1 -raid_sets=`cat /proc/partitions | grep md | awk '{ print $4 }'` -valid_set=`echo $raid_sets | grep $raid_set_name` -if [ -z $valid_set ]; then - echo "$raid_set_name is not a RAID set" -else - if [ -r /dev/${raid_set_name} ]; then - # This should work without sudo because we have read - # access to the dev, but for some reason mdadm must be - # run as root in order to succeed. - sudo /sbin/mdadm --detail /dev/${raid_set_name} - else - echo "Must be administrator or root to display RAID status" - fi -fi diff --git a/src/op_mode/show_configuration_files.sh b/src/op_mode/show_configuration_files.sh new file mode 100755 index 000000000..ad8e0747c --- /dev/null +++ b/src/op_mode/show_configuration_files.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# Wrapper script for the show configuration files command +find ${vyatta_sysconfdir}/config/ \ + -type f \ + -not -name ".*" \ + -not -name "config.boot.*" \ + -printf "%f\t(%Tc)\t%T@\n" \ + | sort -r -k3 \ + | awk -F"\t" '{printf ("%-20s\t%s\n", $1,$2) ;}' diff --git a/src/op_mode/show_disk_format.sh b/src/op_mode/show_disk_format.sh new file mode 100755 index 000000000..61b15a52b --- /dev/null +++ b/src/op_mode/show_disk_format.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +disk_dev="/dev/$1" +if [ ! -b "$disk_dev" ];then + echo "$3 is not a disk device" + exit 1 +fi +sudo /sbin/fdisk -l "$disk_dev" diff --git a/src/op_mode/show_raid.sh b/src/op_mode/show_raid.sh new file mode 100755 index 000000000..ba4174692 --- /dev/null +++ b/src/op_mode/show_raid.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +raid_set_name=$1 +raid_sets=`cat /proc/partitions | grep md | awk '{ print $4 }'` +valid_set=`echo $raid_sets | grep $raid_set_name` +if [ -z $valid_set ]; then + echo "$raid_set_name is not a RAID set" +else + if [ -r /dev/${raid_set_name} ]; then + # This should work without sudo because we have read + # access to the dev, but for some reason mdadm must be + # run as root in order to succeed. + sudo /sbin/mdadm --detail /dev/${raid_set_name} + else + echo "Must be administrator or root to display RAID status" + fi +fi -- cgit v1.2.3 From d4e3868629fd097c57ff6c47fe60b83ba4c3e272 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Sat, 23 Jun 2018 23:50:06 +0200 Subject: T689: updated xml to reflect filename change in last commit --- op-mode-definitions/show-configuration.xml | 2 +- op-mode-definitions/show-disk.xml | 2 +- 2 files changed, 2 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 @@ Show available saved configurations - ${vyos_op_scripts_dir}/show-configuration-files.sh + ${vyos_op_scripts_dir}/show_configuration_files.sh 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 @@ Show disk drive formatting - ${vyos_op_scripts_dir}/show-disk-format.sh $3 + ${vyos_op_scripts_dir}/show_disk_format.sh $3 -- cgit v1.2.3 From db121fec464c96e8ba68a2469ed88d8f49d08b48 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Sun, 24 Jun 2018 10:31:48 +0200 Subject: T689: Removed show host date, it's a duplicate of show date --- op-mode-definitions/show-host.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/op-mode-definitions/show-host.xml b/op-mode-definitions/show-host.xml index 39c6c3acc..0eb342463 100644 --- a/op-mode-definitions/show-host.xml +++ b/op-mode-definitions/show-host.xml @@ -7,13 +7,6 @@ Show host information - - - Show host current date - - /bin/date - - Show domain name -- cgit v1.2.3 From 0c8e4605f19e7caa6fb7ccb7009bb21bb9c6cdbc Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Sun, 24 Jun 2018 11:56:32 +0200 Subject: T689: Removed 'show host os', if anyone wants kernel information i think they know about 'uname -a' and because upgrading kernel in vyos is not allowed outsude the release schedule kernel information shoild be maintained inside the vyos install package. --- op-mode-definitions/show-host.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/op-mode-definitions/show-host.xml b/op-mode-definitions/show-host.xml index 0eb342463..b3ea129a2 100644 --- a/op-mode-definitions/show-host.xml +++ b/op-mode-definitions/show-host.xml @@ -21,13 +21,6 @@ /bin/hostname - - - Show host operating system details - - /bin/uname -a - - Lookup host information for hostname|IPv4 address -- cgit v1.2.3