From 8d273fe8d76ef394cfab04a195c90f4b7aeb8495 Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sat, 4 Jul 2020 23:12:49 +0200 Subject: Fix firstdisk_test for NVMe, add $firstdisk and $firstdiskp vars --- make-boot-image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'make-boot-image.sh') diff --git a/make-boot-image.sh b/make-boot-image.sh index dd93f38..840cce7 100755 --- a/make-boot-image.sh +++ b/make-boot-image.sh @@ -1,6 +1,6 @@ #!/bin/bash -xe PS4='+ ($LINENO) ' # To ease debugging -VERSION="1.2-emac-alpha2" +VERSION="1.2-emac-rc1" # Config # ########## @@ -495,7 +495,7 @@ machine_info() { done lspci -nn | cut -d' ' -f2- | sed -ne 's/^Ethernet[^:]*/network-card/p' ip -o l | sed -ne 's/[0-9]*: \([^:]*\):[^\\]*\\\s*link\/ether\s/network-mac-\1: /p' - lsblk -dnl | sed 's/^/disk: /' + lsblk -dnl --output TRAN,PATH,SIZE,RO,TYPE,MODEL,REV | sort | sed 's/^/disk: /' #lsusb 2>/dev/null | grep -vE hub$ | cut -d: -f2- | sed 's/^ ID/usb-device:/' setterm -bold off } -- cgit v1.2.3