chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal-remote: HTTP(s) support
[elogind.git]
/
src
/
kernel-install
/
kernel-install
diff --git
a/src/kernel-install/kernel-install
b/src/kernel-install/kernel-install
index fb2ee57b5b1b2260929c51fc44dba8c72fea3ec7..3ae1d77e33e026507891a84076d1fc6c5a1065bf 100644
(file)
--- a/
src/kernel-install/kernel-install
+++ b/
src/kernel-install/kernel-install
@@
-21,9
+21,9
@@
usage()
{
usage()
{
- echo "Usage:"
>&2
- echo " $0 add
<kernel-version> <kernel-image>" >&2
- echo " $0 remove
<kernel-version> <kernel-image>" >&2
+ echo "Usage:"
+ echo " $0 add
KERNEL-VERSION KERNEL-IMAGE"
+ echo " $0 remove
KERNEL-VERSION"
}
dropindirs_sort()
}
dropindirs_sort()
@@
-54,9
+54,22
@@
dropindirs_sort()
export LC_COLLATE=C
export LC_COLLATE=C
-COMMAND="$1"
-KERNEL_VERSION="$2"
-KERNEL_IMAGE="$3"
+for i in "$@"; do
+ if [ "$i" == "--help" -o "$i" == "-h" ]; then
+ usage
+ exit 0
+ fi
+done
+
+if [[ "${0##*/}" == 'installkernel' ]]; then
+ COMMAND='add'
+else
+ COMMAND="$1"
+ shift
+fi
+
+KERNEL_VERSION="$1"
+KERNEL_IMAGE="$2"
if [[ -f /etc/machine-id ]]; then
read MACHINE_ID < /etc/machine-id
if [[ -f /etc/machine-id ]]; then
read MACHINE_ID < /etc/machine-id
@@
-69,7
+82,7
@@
if ! [[ $MACHINE_ID ]]; then
fi
if [[ ! $COMMAND ]] || [[ ! $KERNEL_VERSION ]]; then
fi
if [[ ! $COMMAND ]] || [[ ! $KERNEL_VERSION ]]; then
- usage
+ echo "Not enough arguments" >&2
exit 1
fi
exit 1
fi
@@
-84,8
+97,8
@@
readarray -t PLUGINS < <(
case $COMMAND in
add)
case $COMMAND in
add)
- if [[ !
$KERNEL_IMAGE
]]; then
- usage
+ if [[ !
"$KERNEL_IMAGE"
]]; then
+ echo "Command 'add' requires an argument" >&2
exit 1
fi
exit 1
fi
@@
-115,7
+128,7
@@
case $COMMAND in
;;
*)
;;
*)
- usage
+ echo "Unknown command '$COMMAND'" >&2
exit 1
;;
esac
exit 1
;;
esac