- Add dosfstools and mtools as opdepends.

- Increase image size to 64MB.
- Also search for nvme drives to unlock.

4 files changed, 14 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1207e32c591d..f304aab8501b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Oct  2 22:42:00 UTC 2021
+# Mon May  1 19:13:35 UTC 2023
 pkgbase = sedutil
 	pkgdesc = TCG OPAL 2.00 SED Management Program
 	pkgver = 1.20.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Drive-Trust-Alliance/sedutil
 	install = sedutil.install
 	arch = i686
@@ -14,6 +14,8 @@ pkgbase = sedutil
 	optdepends = parted: to create a bootable PBA disk image
 	optdepends = intel-ucode: microcode update files for Intel CPUs
 	optdepends = yubikey-personalization: for yubikey support
+	optdepends = dosfstools: to create a bootable PBA disk image
+	optdepends = mtools: to create a bootable PBA disk image
 	backup = etc/linuxpba/linuxpba.conf
 	source = sedutil-1.20.0.tar.gz::https://github.com/Drive-Trust-Alliance/sedutil/archive/1.20.0.tar.gz
 	source = syslinux.cfg
@@ -29,8 +31,8 @@ pkgbase = sedutil
 	sha256sums = 88016b93cbbef98fa6f5c4e6f58e6c871662b6a7f1fc8dc788c8599fa37a44f3
 	sha256sums = 40d785c16a28a5a8a43050d1731174482ee24459be215d2e4e27ffba3b2e28b2
 	sha256sums = ee3171da9eeab5170815713280588db99118a5fba73eea6373f8555451ab1e5c
-	sha256sums = b860d4d6fcc14a61d110c1d805d919fdfcf0fffaa8f0175b5ecddf60051f7941
-	sha256sums = afc39b504456263e55d137847ff20ec5bb0a399ef8e17bb4ca13f0a2bd80052a
+	sha256sums = 1c0851da29633b4d015a08bf473377b8a9be324704a338ee16224c2861209a76
+	sha256sums = 1e83802f64eeb5a9abd9f284c59fdb92f14443f017db8ab15368de7b4faf9e00
 	sha256sums = e5c3acb3027c7a3c5082d5cf0f5193f190788e64045d2c79a9fd1598b56f151f
 	sha256sums = 44ba634f4b35b1267d62b8b1505fa08a3d5bafa33ebb651ad7b09b53941c40eb
 	sha256sums = daaa13d48b9e72e3185594a0f7c54d2966711ef03b5444141d41be9994710c82
diff --git a/PKGBUILD b/PKGBUILD
index 654fe1e5300d..fedc2a6fd14e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=sedutil
 pkgver=1.20.0
-pkgrel=1
+pkgrel=2
 pkgdesc="TCG OPAL 2.00 SED Management Program"
 arch=('i686' 'x86_64')
 url="https://github.com/Drive-Trust-Alliance/sedutil"
@@ -11,7 +11,9 @@ optdepends=('syslinux: to create a bootable PBA disk image'
             'gptfdisk: to create a bootable PBA disk image'
             'parted: to create a bootable PBA disk image'
             'intel-ucode: microcode update files for Intel CPUs'
-            'yubikey-personalization: for yubikey support')
+            'yubikey-personalization: for yubikey support'
+            'dosfstools: to create a bootable PBA disk image'
+            'mtools: to create a bootable PBA disk image')
 backup=('etc/linuxpba/linuxpba.conf')
 install=sedutil.install
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Drive-Trust-Alliance/${pkgname}/archive/${pkgver}.tar.gz"
@@ -28,8 +30,8 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Drive-Trust-Alliance/${
 sha256sums=('88016b93cbbef98fa6f5c4e6f58e6c871662b6a7f1fc8dc788c8599fa37a44f3'
             '40d785c16a28a5a8a43050d1731174482ee24459be215d2e4e27ffba3b2e28b2'
             'ee3171da9eeab5170815713280588db99118a5fba73eea6373f8555451ab1e5c'
-            'b860d4d6fcc14a61d110c1d805d919fdfcf0fffaa8f0175b5ecddf60051f7941'
-            'afc39b504456263e55d137847ff20ec5bb0a399ef8e17bb4ca13f0a2bd80052a'
+            '1c0851da29633b4d015a08bf473377b8a9be324704a338ee16224c2861209a76'
+            '1e83802f64eeb5a9abd9f284c59fdb92f14443f017db8ab15368de7b4faf9e00'
             'e5c3acb3027c7a3c5082d5cf0f5193f190788e64045d2c79a9fd1598b56f151f'
             '44ba634f4b35b1267d62b8b1505fa08a3d5bafa33ebb651ad7b09b53941c40eb'
             'daaa13d48b9e72e3185594a0f7c54d2966711ef03b5444141d41be9994710c82'
diff --git a/linuxpba-arch b/linuxpba-arch
index 80990313dd2f..627f5f246b2a 100755
--- a/linuxpba-arch
+++ b/linuxpba-arch
@@ -77,7 +77,7 @@ fi
 
 ERRORS=0
 
-for DRIVE in $(sedutil-cli --scan 2>/dev/null | awk '$1 ~ "/dev/sd" && $2 !~ "No" {print $1}')
+for DRIVE in $(sedutil-cli --scan 2>/dev/null | awk '$1 ~ /\/dev\/sd|\/dev\/nvme/ && $2 !~ "No" {print $1}')
 do
     [[ "x$DRIVE" = "x" ]] && continue
     SED_STATUS $(sedutil-cli --query $DRIVE | awk 'NR==2 {name=$3; serial=$5} NR==6 {gsub(",","",$0);lock=$3; mbr=$12} END {print name,serial,lock,mbr}')
diff --git a/mklinuxpba-diskimg b/mklinuxpba-diskimg
index 35612598f4cd..cd1e5017c93b 100755
--- a/mklinuxpba-diskimg
+++ b/mklinuxpba-diskimg
@@ -3,7 +3,7 @@
 mkdiskimg () {
     # Prepare image file
     cp /usr/lib/syslinux/bios/gptmbr.bin $1
-    truncate -s 32M $1
+    truncate -s 64M $1
     sgdisk -n 1:0:0 $1
     sgdisk -t 1:ef00 $1
     sgdisk -A 1:set:2 $1