From 9e9ca25cb3a9c8fed37d028ad2265471bab27c3e Mon Sep 17 00:00:00 2001 From: kszaq Date: Mon, 4 Jul 2016 16:25:03 +0200 Subject: [PATCH] init: Fix updating from img.gz when kernel resides on block device This fixes updating LE from img.gz when installed on WeTek internal memory. --- packages/sysutils/busybox/package.mk | 1 + packages/sysutils/busybox/scripts/init | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 338cd3c046..b1de8471ee 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -253,6 +253,7 @@ makeinstall_init() { cp $PKG_DIR/scripts/functions $INSTALL cp $PKG_DIR/scripts/init $INSTALL sed -e "s/@DISTRONAME@/$DISTRONAME/g" \ + -e "s/@KERNEL_NAME@/$KERNEL_NAME/g" \ -i $INSTALL/init chmod 755 $INSTALL/init } diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index bb3c57d638..31591a44c6 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -727,7 +727,11 @@ # don't make temporary files but instead copy # directly from mountpoint to /flash UPDATE_DIR=$UPDATE_ROOT/.tmp/mnt - UPDATE_KERNEL=$(basename $IMAGE_KERNEL) + if [ ! -b $IMAGE_KERNEL -o -z "@KERNEL_NAME@" ]; then + UPDATE_KERNEL=$(basename $IMAGE_KERNEL) + else + UPDATE_KERNEL="@KERNEL_NAME@" + fi fi sync