From de63ffac36479e940a8c85eeb88f8c18aad3ab43 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Mon, 10 Apr 2017 15:37:56 +0200
Subject: [PATCH] rootfsinstall: fixes for baytrail target

---
 src/rootfsinstall.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/rootfsinstall.sh b/src/rootfsinstall.sh
index 6faa988..aa78e83 100755
--- a/src/rootfsinstall.sh
+++ b/src/rootfsinstall.sh
@@ -163,11 +163,11 @@ case $TARGETDEVICE in
         BOOTFSTYPE=fat16
         BOOTFSSIZE=22M
         BOOTFSSTART=1049k
-        KERNELVER="4.9.9-baytrail"
+        KERNELVER="baytrail"
         KERNELDEST="@BOOT@/vmlinuz-$KERNELVER"
         INSTALLPACKAGES="kernel-baytrail kernel-baytrail-headers \
-           chipone_ts grub-efi rtl8723bs_bt rtl8723bs axpd $INSTALLPACKAGES"
-        REMOVEPACKAGES="kernel-mamba-x86_64"
+           chipone_ts grub-efi rtl8723bs_bt rtl8723bs axpd acpi_tables_patch $INSTALLPACKAGES"
+        REMOVEPACKAGES=""
         FSTAB_ROOT_DEVICE="/dev/sda2"
         ;;
    bpi) ARCH=arm
@@ -423,7 +423,7 @@ search --no-floppy --label --set=root $VOLUME_LABEL
 # Boot entries taken from ISO bootloader
 #
 
-menuentry "4.9.9-baytrail" {
+menuentry "default" {
 echo "Loading /boot/$KERNELDEST"
 linux /boot/$KERNELDEST root=/dev/sda2 ro intel_idle.max_cstate=1 intel_pstate=disabled fbcon=rotate:1 quiet splash
 echo "Loading /boot/$INITRAMFSDEST"
@@ -567,7 +567,7 @@ for c in `seq 1 ${#PRECHROOTCOMMANDS[*]}`; do
 done
 
 for c in `seq 1 ${#CHROOTCOMMANDS[*]}`; do
-   chroot $ROOTMP ${CHROOTCOMMANDS[c-1]} || {
+   eval chroot $ROOTMP ${CHROOTCOMMANDS[c-1]} || {
       echo "ERROR: error running chroot command '${CHROOTCOMMANDS[c-1]}'; aborting."
       exit 1
    }