aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-10-27 10:05:08 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-10-27 11:14:20 +0200
commit82ae0882589a9a5dd528059fbfab71fa2a9e8875 (patch)
tree56e164102adf4fa58b8701a3e6d666dc4164ebe6
parent2d0489a9dc00ece7e0cd79d6c161e9c65be0bff6 (diff)
downloadalpine-conf-82ae0882589a9a5dd528059fbfab71fa2a9e8875.tar.bz2
alpine-conf-82ae0882589a9a5dd528059fbfab71fa2a9e8875.tar.xz
update-kernel: vanilla kernel has no suffix in version
-rw-r--r--update-kernel.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/update-kernel.in b/update-kernel.in
index cafa283..3a3b4a7 100644
--- a/update-kernel.in
+++ b/update-kernel.in
@@ -58,6 +58,12 @@ apk add -qU -t $VIRTUAL mkinitfs squashfs-tools
. /etc/mkinitfs/mkinitfs.conf
FLAVOR=$(uname -r | cut -d - -f 3-)
+KVER_FLAVOR=-$FLAVOR
+if [ -z "$FLAVOR" ]; then
+ FLAVOR=vanilla
+ KVER_FLAVOR=
+fi
+
TMPDIR=$(mktemp -dt $SCRIPT.XXXXXX)
ROOT=$TMPDIR/root
@@ -98,7 +104,7 @@ cp -a "$ROOT/lib/firmware" "$MODLOOP/modules"
mksquashfs "$MODLOOP" "$STAGING/$MODIMG" -comp xz
mkinitfs -q -F "$features squashfs" -b "$ROOT" -o "$STAGING/$FLAVOR.gz" $KVER
-cp "$ROOT/boot/vmlinuz-$FLAVOR" "$STAGING/$FLAVOR"
+cp "$ROOT/boot/vmlinuz$KVER_FLAVOR" "$STAGING/$FLAVOR"
if [ "$MNTDIR" ]; then