From: Harald Hoyer <harald@redhat.com>
Date: Tue, 26 Feb 2013 13:58:38 +0000 (+0100)
Subject: kernel-install: rename the loader entry filename
X-Git-Tag: v198~176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82673dd4104482b9ffe71441d125918409665c5e;p=thirdparty%2Fsystemd.git

kernel-install: rename the loader entry filename

The wildcard matching the default loader entry should always be able to point to
the same machine.

So instead of sorting by <distribution>-<kernel-version>-<machine-id>
we better sort by <machine-id>-<kernel-version>.
---

diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
index 6378d8c315b..16c06e08421 100644
--- a/src/kernel-install/kernel-install
+++ b/src/kernel-install/kernel-install
@@ -69,7 +69,7 @@ fi
 
 BOOT_DIR="/${MACHINE_ID}/${KERNEL_VERSION}"
 BOOT_DIR_ABS="/boot${BOOT_DIR}"
-LOADER_ENTRY="/boot/loader/entries/${ID}-${KERNEL_VERSION}-${MACHINE_ID}.conf"
+LOADER_ENTRY="/boot/loader/entries/${MACHINE_ID}-${KERNEL_VERSION}.conf"
 ret=0
 
 dropindirs_sort()