openmamba/usbinstall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rootfsinstall: fixes for baytrail target

Browse Source
This commit is contained in:
Silvan Calarco 2017-04-10 15:37:56 +02:00
parent f573175805
commit de63ffac36
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rootfsinstall.sh
View File

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