From 0c7bb65bb8c8cbad68ab0902ec01ca0a2541ade1 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 7 Jun 2018 23:23:16 +0200 Subject: T689 Convert reboot and poweroff commands to new syntax --- op-mode-definitions/poweroff.xml | 40 ++++++++++++++++++++++++++++++++++++++++ op-mode-definitions/reboot.xml | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 op-mode-definitions/poweroff.xml create mode 100644 op-mode-definitions/reboot.xml diff --git a/op-mode-definitions/poweroff.xml b/op-mode-definitions/poweroff.xml new file mode 100644 index 000000000..07cea7927 --- /dev/null +++ b/op-mode-definitions/poweroff.xml @@ -0,0 +1,40 @@ + + + + + Poweroff the system + + /opt/vyatta/bin/sudo-users/vyatta-poweroff.pl --action poweroff + + + + Poweroff the system without confirmation + + /opt/vyatta/bin/sudo-users/vyatta-poweroff.pl --action poweroff --now + + + + + Cancel a pending poweroff + + /opt/vyatta/bin/sudo-users/vyatta-poweroff.pl --action poweroff_cancel + + + + + + Poweroff at a specific time + + HH:MM + MMDDYY + midnight + noon + + + /opt/vyatta/bin/sudo-users/vyatta-poweroff.pl --action poweroff_at --at_time '$3' + + + + + + diff --git a/op-mode-definitions/reboot.xml b/op-mode-definitions/reboot.xml new file mode 100644 index 000000000..2c5a85d95 --- /dev/null +++ b/op-mode-definitions/reboot.xml @@ -0,0 +1,40 @@ + + + + + Reboot the system + + /opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot + + + + Reboot the system without confirmation + + /opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot --now + + + + + Cancel a pending reboot + + /opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot_cancel + + + + + + Reboot at a specific time + + HH:MM + MMDDYY + midnight + noon + + + /opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot_at --at_time '$3' + + + + + + -- cgit v1.2.3 From 6b9e8d75d87b859a680f55c694354a24b132cde3 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 7 Jun 2018 23:27:09 +0200 Subject: T689: Convert show date to new syntax --- op-mode-definitions/show-date.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 op-mode-definitions/show-date.xml diff --git a/op-mode-definitions/show-date.xml b/op-mode-definitions/show-date.xml new file mode 100644 index 000000000..0edb4b1ff --- /dev/null +++ b/op-mode-definitions/show-date.xml @@ -0,0 +1,30 @@ + + + + + + + Show system time and date + + /bin/date + + + + Show system date and time as Coordinated Universal Time + + /bin/date -u + + + + Show UTC date in Maya calendar format + + ${vyatta_bindir}/maya-date.py $(date +%s) + + + + + + + + + -- cgit v1.2.3 From 9e14244d84e1525808cecb586e6df93381dd6543 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 7 Jun 2018 23:31:37 +0200 Subject: T689: convert show disks with completion script to new script --- op-mode-definitions/show-disk.xml | 24 ++++++++++++++++++++++++ src/completion/list_disks.sh | 5 +++++ 2 files changed, 29 insertions(+) create mode 100644 op-mode-definitions/show-disk.xml create mode 100755 src/completion/list_disks.sh diff --git a/op-mode-definitions/show-disk.xml b/op-mode-definitions/show-disk.xml new file mode 100644 index 000000000..243a3656a --- /dev/null +++ b/op-mode-definitions/show-disk.xml @@ -0,0 +1,24 @@ + + + + + + + Show status of disk device + + + + + + + + Show disk drive formatting + + ${vyos_op_scripts_dir}/show-disk-format.sh $3 + + + + + + + diff --git a/src/completion/list_disks.sh b/src/completion/list_disks.sh new file mode 100755 index 000000000..f32e558fd --- /dev/null +++ b/src/completion/list_disks.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +# Completion script used by show disks to collect physical disk + +awk 'NR > 2 && $4 !~ /[0-9]$/ { print $4 }' Date: Thu, 7 Jun 2018 23:36:46 +0200 Subject: T689: onvert show arp to new syntax --- op-mode-definitions/show-arp.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 op-mode-definitions/show-arp.xml diff --git a/op-mode-definitions/show-arp.xml b/op-mode-definitions/show-arp.xml new file mode 100644 index 000000000..00b68a331 --- /dev/null +++ b/op-mode-definitions/show-arp.xml @@ -0,0 +1,26 @@ + + + + + + + Show Address Resolution Protocol (ARP) information + + /usr/sbin/arp -e -n + + + + Show Address Resolution Protocol (ARP) cache for specified interface + + + + + + + /usr/sbin/arp -e -n -i '$3' + + + + + + -- cgit v1.2.3 From a10e594c1ad8f1bd51f2be9e82960a43c78ebced Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 7 Jun 2018 23:40:00 +0200 Subject: T689: Convert show bridge to new syntax --- op-mode-definitions/show-bridge.xml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 op-mode-definitions/show-bridge.xml diff --git a/op-mode-definitions/show-bridge.xml b/op-mode-definitions/show-bridge.xml new file mode 100644 index 000000000..53fe9175d --- /dev/null +++ b/op-mode-definitions/show-bridge.xml @@ -0,0 +1,37 @@ + + + + + + + Show bridging information + + /sbin/brctl show + + + + Show bridge information for a given bridge interface + + + + + /sbin/brctl show '$3' + + + + Show bridge Media Access Control (MAC) address table + + /sbin/brctl showmacs '$3' + + + + Show bridge spanning tree information + + /sbin/brctl showstp '$3' + + + + + + + -- cgit v1.2.3 From af3ce969cc18a635f087561f7768070333c3b398 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 7 Jun 2018 23:46:30 +0200 Subject: T689: Convert show users to new syntax --- op-mode-definitions/show-users.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 op-mode-definitions/show-users.xml diff --git a/op-mode-definitions/show-users.xml b/op-mode-definitions/show-users.xml new file mode 100644 index 000000000..a026e47e7 --- /dev/null +++ b/op-mode-definitions/show-users.xml @@ -0,0 +1,30 @@ + + + + + + + Show user information + + who -H + + + + Show 10 recently logged in users + + last -aF -n 10 | sed -e 's/^wtmp begins/Displaying logins since/' + + + + Show specified number of recently logged in users + + NUMBER + + + last -aF -n $4 | sed -e 's/^wtmp begins/Displaying logins since/' + + + + + + -- cgit v1.2.3 From 55110c80f480ba7081af16b43447b92ad295e488 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 7 Jun 2018 23:47:41 +0200 Subject: T689: Convert show hardware to new syntax "show hardware pci detailed" renamed to "show hardware pci detail" to follow the syntax of other commands --- op-mode-definitions/show-hardware.xml | 95 +++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 op-mode-definitions/show-hardware.xml diff --git a/op-mode-definitions/show-hardware.xml b/op-mode-definitions/show-hardware.xml new file mode 100644 index 000000000..1339b9110 --- /dev/null +++ b/op-mode-definitions/show-hardware.xml @@ -0,0 +1,95 @@ + + + + + + + Show system hardware details + + + + + Show CPU info + + lscpu + + + + Show system CPU details + + less $_vyatta_less_options --prompt='.cpu info' -- /proc/cpuinfo + + + + Show CPU's on system + + ${vyatta_bindir}/vyatta-cpu-summary.pl + + + + + + + Show system DMI details + + ${vyatta_bindir}/vyatta-show-dmi + + + + + Show system RAM details + + less $_vyatta_less_options --prompt='.mem info' -- /proc/meminfo + + + + + Show system PCI bus details + + lspci + + + + Show verbose system PCI bus details + + lspci -vvv + + + + + + + + Show SCSI device information + + lsscsi + + + + Show detailed SCSI device information + + lsscsi -vvv + + + + + + + Show peripherals connected to the USB bus + + lsusb + + + + Show detailed USB bus information + + lsusb -v + + + + + + + + + -- cgit v1.2.3 From 327e8d203635d435d75b57f30df6695b56ff63ee Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 7 Jun 2018 23:54:20 +0200 Subject: T689: Convert show raid to new syntax --- op-mode-definitions/show-raid.xml | 18 ++++++++++++++++++ src/completion/list_raidset.sh | 3 +++ src/op_mode/show-raid.sh | 17 +++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 op-mode-definitions/show-raid.xml create mode 100755 src/completion/list_raidset.sh create mode 100755 src/op_mode/show-raid.sh diff --git a/op-mode-definitions/show-raid.xml b/op-mode-definitions/show-raid.xml new file mode 100644 index 000000000..b0930742a --- /dev/null +++ b/op-mode-definitions/show-raid.xml @@ -0,0 +1,18 @@ + + + + + + + Show statis of RAID set + + + + + ${vyos_op_scripts_dir}/show_raid.sh $3 + + + + + + diff --git a/src/completion/list_raidset.sh b/src/completion/list_raidset.sh new file mode 100755 index 000000000..9ff3523aa --- /dev/null +++ b/src/completion/list_raidset.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +echo -n `cat /proc/partitions | grep md | awk '{ print $4 }'` 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 aad1bd7eed672e95d9f49b5c492ba59b30c6b68c Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 7 Jun 2018 23:56:11 +0200 Subject: T689: Convert shwo configuration to new syntax --- op-mode-definitions/show-configuration.xml | 39 ++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 op-mode-definitions/show-configuration.xml diff --git a/op-mode-definitions/show-configuration.xml b/op-mode-definitions/show-configuration.xml new file mode 100644 index 000000000..3fe3cb0dc --- /dev/null +++ b/op-mode-definitions/show-configuration.xml @@ -0,0 +1,39 @@ + + + + + + + Show available saved configurations + + + cli-shell-api showCfg --show-active-only --show-hide-secrets + + + + + Show running configuration (including default values) + + + cli-shell-api showCfg --show-show-defaults --show-active-only --show-hide-secrets + + + + Show running configuration as set commands + + + ${vyatta_sbindir}/vyatta-config-gen-sets.pl + + + + Show available saved configurations + + + ${vyos_op_scripts_dir}/show-configuration-files.sh + + + + + + + -- cgit v1.2.3 From 61dfffa48bac7e5349a04295afb87a08a64f6885 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 7 Jun 2018 23:58:05 +0200 Subject: T689: op_mode script for 'show disk X format' --- src/op_mode/show-disk-format.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 src/op_mode/show-disk-format.sh 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" -- cgit v1.2.3 From f1568230e946f2c0c2b364d8313a4c0563cdd926 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 8 Jun 2018 00:10:35 +0200 Subject: T689: updated edge nodes to leafNode instead of node. --- op-mode-definitions/show-arp.xml | 4 ++-- op-mode-definitions/show-bridge.xml | 12 ++++++------ op-mode-definitions/show-date.xml | 4 ++-- op-mode-definitions/show-disk.xml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/op-mode-definitions/show-arp.xml b/op-mode-definitions/show-arp.xml index 00b68a331..3d40db728 100644 --- a/op-mode-definitions/show-arp.xml +++ b/op-mode-definitions/show-arp.xml @@ -2,12 +2,12 @@ - + Show Address Resolution Protocol (ARP) information /usr/sbin/arp -e -n - + Show Address Resolution Protocol (ARP) cache for specified interface diff --git a/op-mode-definitions/show-bridge.xml b/op-mode-definitions/show-bridge.xml index 53fe9175d..0d80de86e 100644 --- a/op-mode-definitions/show-bridge.xml +++ b/op-mode-definitions/show-bridge.xml @@ -2,12 +2,12 @@ - + Show bridging information /sbin/brctl show - + Show bridge information for a given bridge interface @@ -17,18 +17,18 @@ /sbin/brctl show '$3' - + Show bridge Media Access Control (MAC) address table /sbin/brctl showmacs '$3' - - + + Show bridge spanning tree information /sbin/brctl showstp '$3' - + diff --git a/op-mode-definitions/show-date.xml b/op-mode-definitions/show-date.xml index 0edb4b1ff..dddecd2fb 100644 --- a/op-mode-definitions/show-date.xml +++ b/op-mode-definitions/show-date.xml @@ -14,12 +14,12 @@ /bin/date -u - + Show UTC date in Maya calendar format ${vyatta_bindir}/maya-date.py $(date +%s) - + diff --git a/op-mode-definitions/show-disk.xml b/op-mode-definitions/show-disk.xml index 243a3656a..db473959a 100644 --- a/op-mode-definitions/show-disk.xml +++ b/op-mode-definitions/show-disk.xml @@ -10,12 +10,12 @@ - + Show disk drive formatting ${vyos_op_scripts_dir}/show-disk-format.sh $3 - + -- cgit v1.2.3 From 3399149b8b07fa74229939bc64a3e573191b237b Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 8 Jun 2018 09:47:59 +0200 Subject: T689: Added missing show-configuration-files.sh wrappwe script --- src/op_mode/show-configuration-files.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 src/op_mode/show-configuration-files.sh 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) ;}' -- cgit v1.2.3 From 54796fb7d01fc4d118d7c95943326d1ae185642e Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 8 Jun 2018 10:34:19 +0200 Subject: T689: Removed less from commands in show hardware. using system pager insted. --- op-mode-definitions/show-hardware.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op-mode-definitions/show-hardware.xml b/op-mode-definitions/show-hardware.xml index 1339b9110..c1ee927cf 100644 --- a/op-mode-definitions/show-hardware.xml +++ b/op-mode-definitions/show-hardware.xml @@ -17,7 +17,7 @@ Show system CPU details - less $_vyatta_less_options --prompt='.cpu info' -- /proc/cpuinfo + cat /proc/cpuinfo @@ -39,7 +39,7 @@ Show system RAM details - less $_vyatta_less_options --prompt='.mem info' -- /proc/meminfo + cat /proc/meminfo -- cgit v1.2.3 From 06b807f9b898c6bef55c9c0888bf5fd1c96bc9bd Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 8 Jun 2018 10:48:17 +0200 Subject: T689: Changed syntax on 'show arp XXX' to 'show arp interface XXX' to be compatible with the new parser --- op-mode-definitions/show-arp.xml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/op-mode-definitions/show-arp.xml b/op-mode-definitions/show-arp.xml index 3d40db728..7256bef61 100644 --- a/op-mode-definitions/show-arp.xml +++ b/op-mode-definitions/show-arp.xml @@ -2,24 +2,25 @@ - + Show Address Resolution Protocol (ARP) information /usr/sbin/arp -e -n - - - - Show Address Resolution Protocol (ARP) cache for specified interface - - - - - - - /usr/sbin/arp -e -n -i '$3' - - + + + + Show Address Resolution Protocol (ARP) cache for specified interface + + + + + + + /usr/sbin/arp -e -n -i '$4' + + + -- cgit v1.2.3 From 863aeffa530e3ebdb6a62ebba6886cd77f95f408 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Sat, 9 Jun 2018 22:43:17 +0200 Subject: Migrate away from vyatta-interfaces.pl --- op-mode-definitions/show-arp.xml | 4 +--- op-mode-definitions/show-bridge.xml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/op-mode-definitions/show-arp.xml b/op-mode-definitions/show-arp.xml index 7256bef61..92c231c6f 100644 --- a/op-mode-definitions/show-arp.xml +++ b/op-mode-definitions/show-arp.xml @@ -12,9 +12,7 @@ Show Address Resolution Protocol (ARP) cache for specified interface - - - + /usr/sbin/arp -e -n -i '$4' diff --git a/op-mode-definitions/show-bridge.xml b/op-mode-definitions/show-bridge.xml index 0d80de86e..a3241951a 100644 --- a/op-mode-definitions/show-bridge.xml +++ b/op-mode-definitions/show-bridge.xml @@ -12,7 +12,7 @@ Show bridge information for a given bridge interface - + /sbin/brctl show '$3' -- cgit v1.2.3 From 78b9ce489589b134142ec7f5241bbb7fa9f8c297 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Sat, 9 Jun 2018 22:48:24 +0200 Subject: migrate away from vyatta-cpu-summary.pl --- op-mode-definitions/show-hardware.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-mode-definitions/show-hardware.xml b/op-mode-definitions/show-hardware.xml index c1ee927cf..6cd912aea 100644 --- a/op-mode-definitions/show-hardware.xml +++ b/op-mode-definitions/show-hardware.xml @@ -23,7 +23,7 @@ Show CPU's on system - ${vyatta_bindir}/vyatta-cpu-summary.pl + ${vyos_op_scripts_dir}/cpu_summary.py -- cgit v1.2.3 From cf6be68abc1d43aa56665b2b7af91615b68ae011 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Sat, 9 Jun 2018 23:25:58 +0200 Subject: Migrate away from vyatta-config-gen-sets.pl --- op-mode-definitions/show-configuration.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op-mode-definitions/show-configuration.xml b/op-mode-definitions/show-configuration.xml index 3fe3cb0dc..0b1507ba4 100644 --- a/op-mode-definitions/show-configuration.xml +++ b/op-mode-definitions/show-configuration.xml @@ -8,7 +8,7 @@ cli-shell-api showCfg --show-active-only --show-hide-secrets - + @@ -22,7 +22,7 @@ Show running configuration as set commands - ${vyatta_sbindir}/vyatta-config-gen-sets.pl + cli-shell-api showCfg --show-active-only | vyos-config-to-commands -- cgit v1.2.3