summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-05-14 05:19:20 +0200
committerDaniil Baturin <daniil@baturin.org>2018-05-14 05:20:58 +0200
commit9e37894920aa9ee8f31220eea81ddbc534e7dec7 (patch)
tree5a1567dd26e8b2751654d90c0d3788ee03afcbf6
parent18c58a419dd2e89b5f092baef5e4cccbbe1408dc (diff)
downloadvyatta-op-9e37894920aa9ee8f31220eea81ddbc534e7dec7.tar.gz
vyatta-op-9e37894920aa9ee8f31220eea81ddbc534e7dec7.zip
Remove the show version command from this package: moving to vyos-1x.
-rw-r--r--Makefile.am2
-rw-r--r--scripts/limericks.py51
-rw-r--r--scripts/vyos-show-version111
-rw-r--r--templates/show/version/all/node.def5
-rw-r--r--templates/show/version/funny/node.def5
-rw-r--r--templates/show/version/node.def2
6 files changed, 0 insertions, 176 deletions
diff --git a/Makefile.am b/Makefile.am
index c79a629..ea115cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@ interp_DATA += functions/interpreter/vyatta-image-complete
bin_SCRIPTS = scripts/vyatta-show-interfaces
bin_SCRIPTS += scripts/vyatta-show-interfaces.pl
-bin_SCRIPTS += scripts/vyos-show-version
bin_SCRIPTS += scripts/vyatta-show-dhclient.pl
bin_SCRIPTS += scripts/vyatta-show-dmi
bin_SCRIPTS += scripts/vyatta-tshark-interface-port.pl
@@ -52,7 +51,6 @@ bin_SCRIPTS += scripts/vyatta-monitor-check-rule-log
bin_SCRIPTS += scripts/vyos-show-ram.sh
bin_SCRIPTS += scripts/vyos-strip-config.pl
bin_SCRIPTS += scripts/maya-date.py
-bin_SCRIPTS += scripts/limericks.py
bin_SCRIPTS += scripts/ssh-server-key
sbin_SCRIPTS = scripts/dhcpv6-client-show-leases.pl
diff --git a/scripts/limericks.py b/scripts/limericks.py
deleted file mode 100644
index acb1a74..0000000
--- a/scripts/limericks.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python
-
-import random
-
-limericks = [
-
-"""
-A programmer who's name was Searle
-Once wrote a long program in Perl.
-Despite very few quirks
-No one got how it works,
-Not even the interpreter.
-""",
-
-"""
-There was a young lady of Maine
-Who set up IPsec VPN.
-Problems didn't arise
-'til other vendors' device
-had to add she to that VPN.
-""",
-
-"""
-One day a programmer from York
-started his own Vyatta fork.
-Though he was a huge geek,
-it still took him a week
-to get the damn build scripts to work.
-""",
-
-"""
-A network admin from Hong Kong
-knew MPPE cipher's not strong.
-But he was behind NAT,
-so he put up we that,
-sad network admin from Hong Kong.
-""",
-
-"""
-A network admin named Drake
-greeted friends with a three-way handshake
-and refused to proceed
-if they didn't complete it,
-that standards-compliant guy Drake.
-"""
-
-]
-
-l = limericks[random.randint(0, len(limericks) - 1)]
-
-print(l)
diff --git a/scripts/vyos-show-version b/scripts/vyos-show-version
deleted file mode 100644
index be86b73..0000000
--- a/scripts/vyos-show-version
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2016 VyOS maintainers and contributors
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 or later as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# File: vyos-show-version
-# Purpose:
-# Displays image version and system information.
-# Used by the "run show version" command.
-
-
-import sys
-import subprocess
-import json
-
-import pystache
-
-
-def read_file(name):
- try:
- with open (name, "r") as f:
- data = f.read()
- return data.strip()
- except:
- # This works since we only read /sys/class/* stuff
- # with this function
- return "Unknown"
-
-version_file = '/opt/vyatta/etc/version.json'
-version_data = None
-
-version_output_tmpl = """
-Version: VyOS {{version}}
-Built by: {{built_by}}
-Built on: {{built_on}}
-Build ID: {{build_id}}
-
-Architecture: {{system_arch}}
-Boot via: {{boot_via}}
-System type: {{system_type}}
-
-Hardware vendor: {{hardware_vendor}}
-Hardware model: {{hardware_model}}
-Hardware S/N: {{hardware_serial}}
-Hardware UUID: {{hardware_uuid}}
-
-Copyright: VyOS maintainers and contributors
-
-"""
-
-# Get and display image version data from the built-in version file
-# This gives us image version, built on, build by, and build UUID
-try:
- with open(version_file, 'r') as f:
- version_data = json.load(f)
-except:
- print("Unable to get VyOS version data")
- sys.exit(1)
-
-
-# Get system architecture (well, kernel architecture rather)
-version_data['system_arch'] = subprocess.check_output('uname -m', shell=True).strip()
-
-
-# Get hypervisor name, if any
-system_type = "bare metal"
-try:
- hypervisor = subprocess.check_output('hvinfo 2>/dev/null', shell=True).decode().strip()
- system_type = "{0} guest".format(hypervisor)
-except subprocess.CalledProcessError:
- # hvinfo returns 1 if it cannot detect any hypervisor
- pass
-version_data['system_type'] = system_type
-
-
-# Get boot type, it can be livecd, installed image, or, possible, a system installed
-# via legacy "install system" mechanism
-# In installed images, the squashfs image file is named after its image version,
-# while on livecd it's just "filesystem.squashfs", that's how we tell a livecd boot
-# from an installed image
-boot_via = "installed image"
-if subprocess.call(""" grep -e '^overlay.*/filesystem.squashfs' /proc/mounts >/dev/null""", shell=True) == 0:
- boot_via = "livecd"
-elif subprocess.call(""" grep '^overlay /' /proc/mounts >/dev/null """, shell=True) != 0:
- boot_via = "legacy non-image installation"
-version_data['boot_via'] = boot_via
-
-
-# Get hardware details from DMI
-version_data['hardware_vendor'] = read_file('/sys/class/dmi/id/sys_vendor')
-version_data['hardware_model'] = read_file('/sys/class/dmi/id/product_name')
-
-# These two assume script is run as root, normal users can't access those files
-version_data['hardware_serial'] = read_file('/sys/class/dmi/id/subsystem/id/product_serial')
-version_data['hardware_uuid'] = read_file('/sys/class/dmi/id/subsystem/id/product_uuid')
-
-
-output = pystache.render(version_output_tmpl, version_data).strip()
-print(output)
-
diff --git a/templates/show/version/all/node.def b/templates/show/version/all/node.def
deleted file mode 100644
index e98a16d..0000000
--- a/templates/show/version/all/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: Show VyOS version information plus all packages changes
-run: sudo ${vyatta_bindir}/vyos-show-version
- echo ""
- echo "Package versions:"
- dpkg -l
diff --git a/templates/show/version/funny/node.def b/templates/show/version/funny/node.def
deleted file mode 100644
index cb1b6b0..0000000
--- a/templates/show/version/funny/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: Show VyOS version information plus a funny poem
-run:
- sudo ${vyatta_bindir}/vyos-show-version
- ${vyatta_bindir}/limericks.py
-
diff --git a/templates/show/version/node.def b/templates/show/version/node.def
deleted file mode 100644
index a3fd8af..0000000
--- a/templates/show/version/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show VyOS version information
-run: sudo ${vyatta_bindir}/vyos-show-version