From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Mon, 15 Jul 2019 13:07:40 +0000 (+0200)
Subject: pve-efiboot-tool: accept also 'kernel' for the 'kernels' command
X-Git-Url: https://git.proxmox.com/?p=pve-kernel-meta.git;a=commitdiff_plain;h=992c689e1b6f79d6160643c421b51554ae7733f4

pve-efiboot-tool: accept also 'kernel' for the 'kernels' command

As all operations are done on a single or no version, thus "kernel"
fits minimally better, IMO. But just accept both, for convenience

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/bin/pve-efiboot-tool b/bin/pve-efiboot-tool
index 853a015..a2ff4e1 100755
--- a/bin/pve-efiboot-tool
+++ b/bin/pve-efiboot-tool
@@ -262,8 +262,8 @@ usage() {
 	warn "       $0 init <partition>"
 	warn "       $0 clean [--dry-run]"
 	warn "       $0 refresh"
-	warn "       $0 kernels <add|remove> <kernel-version>"
-	warn "       $0 kernels list"
+	warn "       $0 kernel <add|remove> <kernel-version>"
+	warn "       $0 kernel list"
 	warn "       $0 help"
 }
 
@@ -284,12 +284,12 @@ help() {
 	echo ""
 	echo "    refresh all configured EFI system partitions."
 	echo ""
-	echo "USAGE: $0 kernels <add|remove> <kernel-version>"
+	echo "USAGE: $0 kernel <add|remove> <kernel-version>"
 	echo ""
 	echo "    add/remove pve-kernel with ABI <kernel-version> to list of synced kernels, in addition to automatically selected ones."
 	echo "    NOTE: you need to manually run 'refresh' once you're finished with adding/removing kernels from the list"
 	echo ""
-	echo "USAGE: $0 kernels list"
+	echo "USAGE: $0 kernel list"
 	echo ""
 	echo "    list kernel versions currently selected for inclusion on ESPs."
 	echo ""
@@ -334,10 +334,10 @@ case "$1" in
 		refresh
 		exit 0
 	;;
-	'kernels')
+	'kernel'|'kernels')
 		shift
 		if [ -z "$1" ]; then
-			warn "E: subcommand is mandatory for 'kernels'."
+			warn "E: subcommand is mandatory for 'kernel'."
 			warn ""
 			usage
 			exit 1
@@ -357,7 +357,7 @@ case "$1" in
 				exit 0
 			;;
 			*)
-				warn "E: invalid 'kernels' subcommand '$cmd'."
+				warn "E: invalid 'kernel' subcommand '$cmd'."
 				warn ""
 				usage
 				exit 1