X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fkernel-install%2Fkernel-install;h=16c06e08421da98de928095d4db4e7b743ce165d;hp=769c6096062ed16e2d9e5388672afe511c6b31c8;hb=82673dd4104482b9ffe71441d125918409665c5e;hpb=6557484fb169f4fad7e9e877c7c553288aa67b20 diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install index 769c60960..16c06e084 100644 --- a/src/kernel-install/kernel-install +++ b/src/kernel-install/kernel-install @@ -28,14 +28,14 @@ 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 http://www.freedesktop.org/software/systemd/man/os-release.html" >&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 http://www.freedesktop.org/software/systemd/man/machine-id.html" >&2 + echo "See man:machine-id(5)" >&2 exit 1 fi @@ -67,9 +67,9 @@ if ! ( [[ $COMMAND ]] && [[ $KERNEL_VERSION ]] && [[ $KERNEL_IMAGE ]] ); then 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" +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()