From 6886b0449dbf264f6b7db2a93a1cfee0e4d4080a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= Date: Thu, 25 Apr 2013 20:59:44 +0300 Subject: [PATCH] kernel-install: Clean up - Consistent use of $VAR vs ${VAR} - Consistent use of && vs 'if' - Add error checking to some places - Consistent error messages ("Can't" vs "Cannot", etc.) - Function declarations at the top - Miscellaneous adjustments --- src/kernel-install/kernel-install | 159 ++++++++++++++++-------------- 1 file changed, 86 insertions(+), 73 deletions(-) diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install index 9f3a52321..be4a8e274 100644 --- a/src/kernel-install/kernel-install +++ b/src/kernel-install/kernel-install @@ -19,66 +19,25 @@ # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see . -export LC_COLLATE=C - -COMMAND="$1" -KERNEL_VERSION="$2" -KERNEL_IMAGE="$3" - -[[ -f /etc/os-release ]] && . /etc/os-release -if ! [[ $ID ]]; then - echo "Can't determine the name of your distribution. Please create /etc/os-release." >&2 - echo "See man:os-release(5)" >&2 - exit 1 -fi - -[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id -if ! [[ $MACHINE_ID ]]; then - echo "Can't determine your machine id. Please create /etc/machine-id!" >&2 - echo "See man:machine-id(5)" >&2 - exit 1 -fi - -if [[ -f /etc/kernel/cmdline ]]; then - readarray -t BOOT_OPTIONS < /etc/kernel/cmdline -fi - -if ! [[ "${BOOT_OPTIONS[@]}" ]]; then - readarray -t BOOT_OPTIONS < /proc/cmdline -fi - -if ! [[ $BOOT_OPTIONS ]]; then - echo "Can't determine the kernel command line parameters." >&2 - echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2 - exit 1 -fi - usage() { - { - echo "Usage:" - echo " $0 add " - echo " $0 remove " - } >&2 + echo "Usage:" >&2 + echo " $0 add " >&2 + echo " $0 remove " >&2 } -if ! ( [[ $COMMAND ]] && [[ $KERNEL_VERSION ]] ); then - usage - exit 1 -fi - -BOOT_DIR="/${MACHINE_ID}/${KERNEL_VERSION}" -BOOT_DIR_ABS="/boot${BOOT_DIR}" -LOADER_ENTRY="/boot/loader/entries/${MACHINE_ID}-${KERNEL_VERSION}.conf" -ret=0 - dropindirs_sort() { - suffix=$1; shift - readarray -t files< <( + local suffix=$1; shift + local -a files + local f d i + + readarray -t files < <( for d in "$@"; do - for i in "${d}/"*${suffix}; do - [[ -e $i ]] && echo ${i##*/} + for i in "$d/"*"$suffix"; do + if [[ -e "$i" ]]; then + echo "${i##*/}" + fi done done | sort -Vu ) @@ -93,47 +52,101 @@ dropindirs_sort() done } +export LC_COLLATE=C + +COMMAND="$1" +KERNEL_VERSION="$2" +KERNEL_IMAGE="$3" + +if [[ -f /etc/os-release ]]; then + . /etc/os-release +fi + +if ! [[ $ID ]]; then + echo "Could not determine the distribution name from /etc/os-release." >&2 + echo "Please specify ID=... in /etc/os-release. See man:os-release(5)" >&2 + exit 1 +fi + +if [[ -f /etc/machine-id ]]; then + read MACHINE_ID < /etc/machine-id +fi + +if ! [[ $MACHINE_ID ]]; then + echo "Could not determine your machine ID from /etc/machine-id." >&2 + echo "Please run 'systemd-machine-id-setup' as root. See man:machine-id(5)" >&2 + exit 1 +fi + +if [[ -f /etc/kernel/cmdline ]]; then + readarray -t BOOT_OPTIONS < /etc/kernel/cmdline +fi + +if ! [[ ${BOOT_OPTIONS[*]} ]]; then + readarray -t BOOT_OPTIONS < /proc/cmdline +fi + +if ! [[ $BOOT_OPTIONS ]]; then + echo "Could not determine the kernel command line parameters." >&2 + echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2 + exit 1 +fi + +if [[ ! $COMMAND ]] || [[ ! $KERNEL_VERSION ]]; then + usage + exit 1 +fi + +BOOT_DIR="/$MACHINE_ID/$KERNEL_VERSION" +BOOT_DIR_ABS="/boot$BOOT_DIR" +LOADER_ENTRY="/boot/loader/entries/$MACHINE_ID-$KERNEL_VERSION.conf" +ret=0 + readarray -t PLUGINS < <( dropindirs_sort ".install" \ "/etc/kernel/install.d" \ "/usr/lib/kernel/install.d" ) -case "$COMMAND" in +case $COMMAND in add) - if [[ -z $KERNEL_IMAGE ]]; then + if [[ ! $KERNEL_IMAGE ]]; then usage exit 1 fi - mkdir -p "$BOOT_DIR_ABS" || exit 1 + + mkdir -p "$BOOT_DIR_ABS" || { + echo "Could not create boot directory '$BOOT_DIR_ABS'." >&2 + exit 1 + } for f in "${PLUGINS[@]}"; do [[ -x $f ]] && "$f" add "$KERNEL_VERSION" "$BOOT_DIR_ABS" ((ret+=$?)) done - if ! cp --preserve "$KERNEL_IMAGE" "$BOOT_DIR_ABS"/linux; then - echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/linux'!" >&2 - fi + cp --preserve "$KERNEL_IMAGE" "$BOOT_DIR_ABS/linux" || { + echo "Could not copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/linux'." >&2 + exit 1 + } - [[ -d /boot/loader/entries ]] || mkdir -p /boot/loader/entries + mkdir -p "${LOADER_ENTRY%/*}" || { + echo "Could not create loader entry directory '${LOADER_ENTRY%/*}'." >&2 + exit 1 + } { echo "title $PRETTY_NAME" echo "version $KERNEL_VERSION" echo "machine-id $MACHINE_ID" - echo "options ${BOOT_OPTIONS[@]}" + echo "options ${BOOT_OPTIONS[*]}" echo "linux $BOOT_DIR/linux" - [[ -f "${BOOT_DIR_ABS}"/initrd ]] && \ + [[ -f $BOOT_DIR_ABS/initrd ]] && \ echo "initrd $BOOT_DIR/initrd" - : - } > $LOADER_ENTRY - - ((ret+=$?)) - - if ! [[ -f $LOADER_ENTRY ]]; then - echo "Could not create '$LOADER_ENTRY'!" >&2 - fi + } > "$LOADER_ENTRY" || { + echo "Could not create loader entry '$LOADER_ENTRY'." >&2 + exit 1 + } ;; remove) @@ -142,13 +155,13 @@ case "$COMMAND" in ((ret+=$?)) done - rm -fr "$BOOT_DIR_ABS" - rm -f "$LOADER_ENTRY" + rm -rf "$LOADER_ENTRY" "$BOOT_DIR_ABS" ;; *) usage - ret=1;; + exit 1 + ;; esac ((ret+=$?))