X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fkernel-install%2Fkernel-install;h=fb2ee57b5b1b2260929c51fc44dba8c72fea3ec7;hb=d98cc1c019651b895464161072894a02cc43daab;hp=6378d8c315bde5149ffe0b23b5195baf0079c649;hpb=4120b92f8e3977c644c5fb1ab0c7bc505108d491;p=elogind.git
diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
index 6378d8c31..fb2ee57b5 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 ]] && [[ $KERNEL_IMAGE ]] ); then
- usage
- exit 1
-fi
-
-BOOT_DIR="/${MACHINE_ID}/${KERNEL_VERSION}"
-BOOT_DIR_ABS="/boot${BOOT_DIR}"
-LOADER_ENTRY="/boot/loader/entries/${ID}-${KERNEL_VERSION}-${MACHINE_ID}.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,60 +52,72 @@ dropindirs_sort()
done
}
+export LC_COLLATE=C
+
+COMMAND="$1"
+KERNEL_VERSION="$2"
+KERNEL_IMAGE="$3"
+
+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 [[ ! $COMMAND ]] || [[ ! $KERNEL_VERSION ]]; then
+ usage
+ exit 1
+fi
+
+BOOT_DIR_ABS="/boot/$MACHINE_ID/$KERNEL_VERSION"
+ret=0
+
readarray -t PLUGINS < <(
dropindirs_sort ".install" \
"/etc/kernel/install.d" \
"/usr/lib/kernel/install.d"
)
-case "$COMMAND" in
+case $COMMAND in
add)
- mkdir -p "$BOOT_DIR_ABS" || 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
+ if [[ ! $KERNEL_IMAGE ]]; then
+ usage
+ exit 1
fi
- [[ -d /boot/loader/entries ]] || mkdir -p /boot/loader/entries
+ mkdir -p "$BOOT_DIR_ABS" || {
+ echo "Could not create boot directory '$BOOT_DIR_ABS'." >&2
+ exit 1
+ }
- {
- echo "title $PRETTY_NAME"
- echo "version $KERNEL_VERSION"
- echo "machine-id $MACHINE_ID"
- echo "options ${BOOT_OPTIONS[@]}"
- echo "linux $BOOT_DIR/linux"
- [[ -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
+ for f in "${PLUGINS[@]}"; do
+ if [[ -x $f ]]; then
+ "$f" add "$KERNEL_VERSION" "$BOOT_DIR_ABS" "$KERNEL_IMAGE"
+ ((ret+=$?))
+ fi
+ done
;;
remove)
for f in "${PLUGINS[@]}"; do
- [[ -x $f ]] && "$f" remove "$KERNEL_VERSION" "$BOOT_DIR_ABS"
- ((ret+=$?))
+ if [[ -x $f ]]; then
+ "$f" remove "$KERNEL_VERSION" "$BOOT_DIR_ABS"
+ ((ret+=$?))
+ fi
done
- rm -fr "$BOOT_DIR_ABS"
- rm -f "$LOADER_ENTRY"
+ rm -rf "$BOOT_DIR_ABS"
+ ((ret+=$?))
;;
*)
usage
- ret=1;;
+ exit 1
+ ;;
esac
-((ret+=$?))
-
exit $ret