From 0d21de59e3078fa39a7ac534ee309b708ee650dc Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 24 Jul 2016 12:53:02 -0500 Subject: [PATCH] fix USB detection on devices with emmc; update Baytrail Full ROMs Full ROMs fix detection of emmc/sd storage under Windows/Windows setup closes #12 Signed-off-by: Matt DeVillier --- functions.sh | 7 ++++--- sources.sh | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/functions.sh b/functions.sh index 54a85ba..4036856 100644 --- a/functions.sh +++ b/functions.sh @@ -89,12 +89,13 @@ function die() #################### function list_usb_devices() { -#list available drives, excluding internal HDD and root device -rootdev="/dev/sda" +#list available drives, excluding internal storage and root/boot device +[[ -f /dev/mmcblk0 ]] && intStor="/dev/mmcblk0" || intStor="/dev/sda" +rootdev=${intStor} if [ "$(which rootdev)" ]; then rootdev=$(rootdev -d -s) fi -eval usb_devs="($(fdisk -l 2> /dev/null | grep -v 'Disk /dev/sda' | grep -v "Disk $rootdev" | grep 'Disk /dev/sd' | awk -F"/dev/sd|:" '{print $2}'))" +eval usb_devs="($(fdisk -l 2> /dev/null | grep -v 'Disk ${intStor}' | grep -v "Disk $rootdev" | grep 'Disk /dev/sd' | awk -F"/dev/sd|:" '{print $2}'))" #ensure at least 1 drive available [ "$usb_devs" != "" ] || return 1 echo -e "\nDevices available:\n" diff --git a/sources.sh b/sources.sh index 1f731c3..7ac2d27 100644 --- a/sources.sh +++ b/sources.sh @@ -3,7 +3,7 @@ #define these here for easy updating -script_date="[2016-07-21]" +script_date="[2016-07-24]" #where the stuff is util_source="https://www.mrchromebox.tech/files/util/" @@ -26,10 +26,10 @@ LE_version_stable="7.0.2" LE_version_latest="7.90.003" #SBIB full ROMs -coreboot_stumpy="coreboot-seabios-stumpy-mrchromebox-20160719.rom" +coreboot_stumpy="coreboot-seabios-stumpy-mrchromebox-20160724.rom" #Haswell full ROMs -coreboot_hsw_box="coreboot-seabios-panther-mrchromebox-20160719.rom" +coreboot_hsw_box="coreboot-seabios-panther-mrchromebox-20160724.rom" coreboot_peppy="coreboot-seabios-peppy-20160108-coolstar.rom" coreboot_peppy_elan="coreboot-seabios-peppy-20160108-coolstar-elan.rom" coreboot_falco="coreboot-seabios-falco-20160108-coolstar.rom" @@ -37,9 +37,9 @@ coreboot_wolf="coreboot-seabios-wolf-20160108-coolstar.rom" coreboot_leon="coreboot-seabios-leon-20160108-coolstar.rom" #Broadwell full ROMs -coreboot_guado="coreboot-seabios-guado-mrchromebox-20160719.rom" -coreboot_rikku="coreboot-seabios-rikku-mrchromebox-20160719.rom" -coreboot_tidus="coreboot-seabios-tidus-mrchromebox-20160719.rom" +coreboot_guado="coreboot-seabios-guado-mrchromebox-20160724.rom" +coreboot_rikku="coreboot-seabios-rikku-mrchromebox-20160724.rom" +coreboot_tidus="coreboot-seabios-tidus-mrchromebox-20160724.rom" coreboot_auron_paine="coreboot-seabios-auron-20160109-coolstar.rom" coreboot_auron_yuna=${coreboot_auron_paine} coreboot_gandof="coreboot-seabios-gandof-20160309-coolstar.rom" @@ -47,12 +47,12 @@ coreboot_lulu="coreboot-seabios-lulu-20160311-coolstar.rom" coreboot_samus="coreboot-seabios-samus-20160324-coolstar.rom" #BayTrail full ROMs -coreboot_enguarde="coreboot-seabios-enguarde-mrchromebox-20160719.rom" -coreboot_glimmer="coreboot-seabios-glimmer-mrchromebox-20160719.rom" -coreboot_gnawty="coreboot-seabios-gnawty-mrchromebox-20160721.rom" -coreboot_ninja="coreboot-seabios-ninja-mrchromebox-20160719.rom" -coreboot_quawks="coreboot-seabios-quawks-mrchromebox-20160719.rom" -coreboot_swanky="coreboot-seabios-swanky-mrchromebox-20160719.rom" +coreboot_enguarde="coreboot-seabios-enguarde-mrchromebox-20160724.rom" +coreboot_glimmer="coreboot-seabios-glimmer-mrchromebox-20160724.rom" +coreboot_gnawty="coreboot-seabios-gnawty-mrchromebox-20160724.rom" +coreboot_ninja="coreboot-seabios-ninja-mrchromebox-20160724.rom" +coreboot_quawks="coreboot-seabios-quawks-mrchromebox-20160724.rom" +coreboot_swanky="coreboot-seabios-swanky-mrchromebox-20160724.rom" #RW_LEGACY payloads