summaryrefslogtreecommitdiff
path: root/make-boot-image.sh
diff options
context:
space:
mode:
authorLudovic Pouzenc <ludovic@pouzenc.fr>2020-07-04 23:12:49 +0200
committerLudovic Pouzenc <ludovic@pouzenc.fr>2020-07-04 23:12:49 +0200
commit8d273fe8d76ef394cfab04a195c90f4b7aeb8495 (patch)
tree56c3bfab8caf76643e43ec06057694f311db862e /make-boot-image.sh
parent2f0e8730567070d66609633a4006b952eb13ab40 (diff)
downloadeficast-8d273fe8d76ef394cfab04a195c90f4b7aeb8495.tar.gz
eficast-8d273fe8d76ef394cfab04a195c90f4b7aeb8495.tar.bz2
eficast-8d273fe8d76ef394cfab04a195c90f4b7aeb8495.zip
Fix firstdisk_test for NVMe, add $firstdisk and $firstdiskp vars
Diffstat (limited to 'make-boot-image.sh')
-rwxr-xr-xmake-boot-image.sh4
1 files changed, 2 insertions, 2 deletions
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
}