4 files changed, 39 insertions, 7 deletions
diff --git a/src/completion/list_disks.py b/src/completion/list_disks.py
index ff1135e23..0aa872abb 100755
--- a/src/completion/list_disks.py
+++ b/src/completion/list_disks.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2019 VyOS maintainers and contributors
+# Copyright (C) 2019-2021 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
@@ -23,11 +23,20 @@ parser.add_argument("-e", "--exclude", type=str, help="Exclude specified device
 args = parser.parse_args()
 
 disks = set()
-with open('/proc/partitions') as partitions_file:
-    for line in partitions_file:
-        fields = line.strip().split()
-        if len(fields) == 4 and fields[3].isalpha() and fields[3] != 'name':
-            disks.add(fields[3])
+with open('/proc/partitions') as f:
+  table = f.read()
+
+for line in table.splitlines()[1:]:
+    fields = line.strip().split()
+    # probably an empty line at the top
+    if len(fields) == 0:
+        continue
+    disks.add(fields[3])
+
+if 'loop0' in disks:
+    disks.remove('loop0')
+if 'sr0' in disks:
+    disks.remove('sr0')
 
 if args.exclude:
     disks.remove(args.exclude)
diff --git a/src/completion/list_dumpable_interfaces.py b/src/completion/list_dumpable_interfaces.py
index 101c92fbe..67bf6206b 100755
--- a/src/completion/list_dumpable_interfaces.py
+++ b/src/completion/list_dumpable_interfaces.py
@@ -7,6 +7,6 @@ import re
 from vyos.util import cmd
 
 if __name__ == '__main__':
-    out = cmd('/usr/sbin/tcpdump -D').split('\n')
+    out = cmd('tcpdump -D').split('\n')
     intfs = " ".join(map(lambda s: re.search(r'\d+\.(\S+)\s', s).group(1), out))
     print(intfs)
diff --git a/src/completion/list_protocols.sh b/src/completion/list_protocols.sh
new file mode 100755
index 000000000..e9d50a70f
--- /dev/null
+++ b/src/completion/list_protocols.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+grep -v '^#' /etc/protocols | awk 'BEGIN {ORS=""} {if ($3) {print TRS $1; TRS=" "}}'
diff --git a/src/completion/list_sysctl_parameters.sh b/src/completion/list_sysctl_parameters.sh
new file mode 100755
index 000000000..c111716bb
--- /dev/null
+++ b/src/completion/list_sysctl_parameters.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Copyright (C) 2021 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/>.
+
+declare -a vals
+eval "vals=($(/sbin/sysctl -N -a))"
+echo ${vals[@]}
+exit 0