cryptpilot-convert: fix failed checking free nbd device when no nbd kernel module avaliable

Signed-off-by: Kun Lai <[email protected]>

Author: imlk0

cryptpilot-convert.sh

@@ -2,6 +2,7 @@
 
 set -e # exit on error
 set -u # exit when variable not set
+shopt -s nullglob
 
 # To avoid locale issues.
 export LC_ALL=C
@@ -125,11 +126,11 @@ disk::align_start_sector() {
 
 # https://unix.stackexchange.com/a/312273
 disk::nbd_available() {
-    [[ $(blockdev --getsize64 $1) -eq 0 ]]
+    [[ $(blockdev --getsize64 $1) == 0 ]]
 }
 
 disk::get_available_nbd() {
-    modprobe nbd max_part=8
+    { lsmod | grep nbd >/dev/null; } || modprobe nbd max_part=8
     # If run in container, use following instead
     #
     # mknod /dev/nbd0 b 43 0

src/fs/block/blktrace/mod.rs

@@ -83,7 +83,7 @@ impl BlkTrace {
             false
         });
         if !mounted {
-            tracing::info!("debugfs not mounted, mounting it now");
+            tracing::debug!("debugfs not mounted, mounting it now");
             tokio::fs::create_dir_all(&debugfs).await?;
 
             tokio::task::spawn_blocking(move || -> Result<_> {

src/fs/cmd.rs

@@ -54,6 +54,8 @@ impl CheckCommandOutput for Command {
         input_bytes: Option<&[u8]>,
         f: impl Fn(i32, Vec<u8>, Vec<u8>) -> Result<R> + Send + Sync,
     ) -> Result<R> {
+        tracing::trace!(cmd=?self.as_std(), "run external cmd");
+
         async {
             // Spawn the command and get output
             let output = async {