diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-06-06 00:52:24 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-06-06 00:52:24 +0200 |
commit | 1b86c4587d62dd36aa515db471b8538838844bba (patch) | |
tree | 025ae4078a2588327c9838f7ef62c5093e3a6b69 | |
parent | 8639bd061183b0b4319015a85f5a29b355deea95 (diff) | |
download | vyatta-op-1b86c4587d62dd36aa515db471b8538838844bba.tar.gz vyatta-op-1b86c4587d62dd36aa515db471b8538838844bba.zip |
op-mode: ethernet: T2546: migrate identify subcommand to vyos-1x
-rw-r--r-- | Makefile.am | 3 | ||||
-rwxr-xr-x | scripts/vyatta-identify-interface.pl | 57 | ||||
-rw-r--r-- | templates/show/interfaces/ethernet/node.tag/identify/node.def | 2 |
3 files changed, 1 insertions, 61 deletions
diff --git a/Makefile.am b/Makefile.am index 3e65dd8..fa693bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,8 +44,7 @@ sbin_SCRIPTS += scripts/vyatta-image-tools.pl sbin_SCRIPTS += scripts/vyatta-regen-unpriv-commands.sh sbin_SCRIPTS += scripts/vyos-openvpn-remoteconfig.pl -bin_sudo_users_SCRIPTS = scripts/vyatta-identify-interface.pl -bin_sudo_users_SCRIPTS += scripts/vyatta-delete-log-file.sh +bin_sudo_users_SCRIPTS = scripts/vyatta-delete-log-file.sh all-local: ./gen-unpriv-commands.sh diff --git a/scripts/vyatta-identify-interface.pl b/scripts/vyatta-identify-interface.pl deleted file mode 100755 index a116963..0000000 --- a/scripts/vyatta-identify-interface.pl +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/perl -# -# Module: vyatta-identify-interface.pl -# -# **** License **** -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 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. -# -# This code was originally developed by Vyatta, Inc. -# Portions created by Vyatta are Copyright (C) 2007 Vyatta, Inc. -# All Rights Reserved. -# -# Author: An-Cheng Huang -# Date: February 2008 -# Description: Script to visually identify an interface -# -# **** End License **** - -use strict; - -my $intf = shift; - -if (!($intf =~ /^(eth\d+|en[ospx])/)) { - print STDERR "This command only supports Ethernet interfaces\n"; - exit 1; -} - -if (! -e "/sys/class/net/$intf") { - print STDERR "\"$intf\" is not a valid interface\n"; - exit 1; -} - -my $cpid = fork(); -if ($cpid == 0) { - # child - print "Interface $intf should be blinking now.\n"; - print "Press Enter to stop...\n"; - exec("/sbin/ethtool -p $intf"); - # not reachable - exit 0; -} else { - # parent - my $c = 0; - while (($c = getc) ne "\n") { - } - kill 9, $cpid; - waitpid $cpid, 0; -} - -exit 0; - diff --git a/templates/show/interfaces/ethernet/node.tag/identify/node.def b/templates/show/interfaces/ethernet/node.tag/identify/node.def deleted file mode 100644 index d308621..0000000 --- a/templates/show/interfaces/ethernet/node.tag/identify/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Visually identify the specified ethernet interface -run: sudo ${vyatta_bindir}/sudo-users/vyatta-identify-interface.pl "$4" |