From 2a218ea1205c8dd547b742931290058def5de85f Mon Sep 17 00:00:00 2001 From: lonkaars Date: Sun, 4 Feb 2024 20:50:23 +0100 Subject: fix sd card detection for laptop the sd card is detected as removable and listed as a /dev/sd* device on my desktop pc, but listed as /dev/mmcblk* and non-removable on my laptop. now the state/gen script checks if it is EITHER removable or starts with mmcblk. also fixed `make status` output to look nicer --- state/gen | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'state') diff --git a/state/gen b/state/gen index b55096d..e14e337 100755 --- a/state/gen +++ b/state/gen @@ -25,11 +25,12 @@ rm -f sdcard_part sdcard_fmt # if no explicit SDCARD_DISK is set, guess which device is the sd card by # checking if it is removable AND has a size of approx. 8GB if [ -z "$SDCARD_DISK" ] ; then - SDCARD_DISK="$(lsblk --noheadings --bytes --output PATH,SIZE,TYPE,RM | awk ' + SDCARD_DISK="$(lsblk --noheadings --bytes --list \ + --output PATH,SIZE,TYPE,RM,NAME | awk ' $3 != "disk" { next } $2 < 7900000000 { next } $2 > 8000000000 { next } - $4 != 1 { next } + ($4 != 1) && (match($5, /^mmcblk/) == 0) { next } { print $1 }' | head -n1)" fi if [ -n "$SDCARD_DISK" ] ; then -- cgit v1.2.3